commit c6a414c4f0c41dfa310d9e8cfbd96f19473e9aab
author Yi Kong <yikong@google.com> Mon Aug 19 17:53:39 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 19 17:53:39 2019 -0700
tree 64e4b8ddb7e81b29bf8720eb882bf1e4d8a5ee0e
parent b19ccd9ead5c439e8682064af719523992eb5b41
parent 849d9ae0be0a58082ee16cd5d5334fea159100e8

Merge "Fix ODR violation" am: ebfd2a468b am: 4a2b31f210 am: aaab53f52b am: 4d84f7fa8c
am: 849d9ae0be

Change-Id: I20ed5ac174a45b622c261b898d8ce855e82fb151

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index 3233cc3..38d495f 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -269,11 +269,13 @@
     shared_libs: [
         "libcutils",
         "libhidl-gen-utils",
-        "libjsoncpp",
         "liblog",
         "libprocessgroup",
         "libprotobuf-cpp-lite",
     ],
+    header_libs: [
+        "libjsoncpp_headers",
+    ],
     srcs: [
         "action.cpp",
         "action_manager.cpp",