| commit | aaab53f52be81fe14e3b93c5ab153be8160e67c6 | [log] [tgz] |
|---|---|---|
| author | Yi Kong <yikong@google.com> | Mon Aug 19 17:22:48 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 19 17:22:48 2019 -0700 |
| tree | 56bf47bc390df1904d8be05e107af190ae389536 | |
| parent | 343a5edc4c7d55dd19b709b35723c50471fb45bd [diff] | |
| parent | 4a2b31f210b47b617bbc84f76d6c79599f4ec8d5 [diff] |
Merge "Fix ODR violation" am: ebfd2a468b am: 4a2b31f210 Change-Id: I3fe7e595efba80ae2e79ee5b974f2393d216535f
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",