resolve merge conflicts of afc0aa78f to oc-dev-plus-aosp
am: 1e00517d71
Change-Id: Ic9c11a227c76aca0f0d91531a8bddcd59f5ed821
diff --git a/libutils/Android.bp b/libutils/Android.bp
index 696db3b..83952ab 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -17,8 +17,14 @@
vendor_available: true,
host_supported: true,
- header_libs: ["libsystem_headers",],
- export_header_lib_headers: ["libsystem_headers",],
+ header_libs: [
+ "libsystem_headers",
+ "libcutils_headers"
+ ],
+ export_header_lib_headers: [
+ "libsystem_headers",
+ "libcutils_headers"
+ ],
export_include_dirs: ["include"],
target: {