Merge "Fix ODR violation"

2019-08-19 23:58:50 +00:00 · 2019-08-19 23:58:50 +00:00 · ebfd2a468b
commit ebfd2a468b
parent ef356fa5bd 0f6537c437
1 changed files with 3 additions and 1 deletions
--- a/init/Android.bp
+++ b/init/Android.bp
@ -269,11 +269,13 @@ cc_binary {
    shared_libs: [
        "libcutils",
        "libhidl-gen-utils",
-        "libjsoncpp",
        "liblog",
        "libprocessgroup",
        "libprotobuf-cpp-lite",
    ],
+    header_libs: [
+        "libjsoncpp_headers",
+    ],
    srcs: [
        "action.cpp",
        "action_manager.cpp",