commit f851a6dc0a31fa6cf4d8d9ca9f0ca245b9c1f845
author Baligh Uddin <baligh@google.com> Sat Oct 24 14:31:41 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Oct 24 14:31:41 2020 +0000
tree 420c91470389ec072729a5c919e7e13457cb791c
parent d8dcc34e3f78f89f63cf3b6dcdf20bc74c87abbf
parent e2fe5c416b41a8242252e456caa6bd55426db639

Merge "Switch "system/core/base" ref to "system/libbase"" am: cc1d613e76 am: 04b0bdee74 am: 4a70e3bf2f am: e2fe5c416b

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1470497

Change-Id: I4bc2b64599496a225d3a2093175199eeca3ee0b5

health/1.0/default/Android.bp

diff --git a/health/1.0/default/Android.bp b/health/1.0/default/Android.bp
index b815eae..aab9cc7 100644
--- a/health/1.0/default/Android.bp
+++ b/health/1.0/default/Android.bp
@@ -4,7 +4,7 @@
     recovery_available: true,
     srcs: ["convert.cpp"],
     include_dirs: [
-        "system/core/base/include",
+        "system/libbase/include",
     ],
     header_libs: ["libhealthd_headers"],
     export_header_lib_headers: ["libhealthd_headers"],

health/1.0/default/libhealthd/Android.bp

diff --git a/health/1.0/default/libhealthd/Android.bp b/health/1.0/default/libhealthd/Android.bp
index a90d50d..43463eb 100644
--- a/health/1.0/default/libhealthd/Android.bp
+++ b/health/1.0/default/libhealthd/Android.bp
@@ -6,6 +6,6 @@
     vendor_available: true,
     recovery_available: true,
     cflags: ["-Werror"],
-    include_dirs: ["system/core/base/include"],
+    include_dirs: ["system/libbase/include"],
     header_libs: ["libhealthd_headers"],
 }