commit c1c275dd5c3f53d51ca1a60f11c8c8e8e9cb67a9
author Tao Bao <tbao@google.com> Thu Oct 03 17:23:22 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 03 17:23:22 2019 -0700
tree ac045951aac91d5fbca47adff5fc389ed9161017
parent c2e4f011cedfadfae7d0c445a4b61f6522432c66
parent 7018c5b2d8d9c7433f2f6a28b5b57505fbaa2adb

Merge "recovery_utils: Use libvoid_headers." am: 4782e79324
am: 7018c5b2d8

Change-Id: I65988e9fd53ec68be39d9bb44d2268df22dd911c

recovery_utils/Android.bp

diff --git a/recovery_utils/Android.bp b/recovery_utils/Android.bp
index 463f27f..1f42217 100644
--- a/recovery_utils/Android.bp
+++ b/recovery_utils/Android.bp
@@ -57,15 +57,16 @@
         "thermalutil.cpp",
     ],
 
+    header_libs: [
+        "libvold_headers",
+    ],
+
     export_include_dirs: [
         "include",
     ],
 
-    include_dirs: [
-        "system/vold",
-    ],
-
     export_static_lib_headers: [
+        // roots.h includes <fstab/fstab.h>.
         "libfstab",
     ],