resolve merge conflicts of afc0aa78f to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution. Change-Id: I0e1cc5f5367c4840eea5f56670f74a44743f1853
2017-04-28 10:52:15 +09:00 · 2017-04-28 10:52:15 +09:00 · 1e00517d71
parent 552a4c10b3 afc0aa78f4
commit 1e00517d71
1 changed files with 8 additions and 2 deletions
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@ -17,8 +17,14 @@ cc_library_headers {
    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: {