| commit | ebfd2a468b3070fbd6376428a84615829760beb1 | [log] [tgz] |
|---|---|---|
| author | Yi Kong <yikong@google.com> | Mon Aug 19 23:58:50 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Aug 19 23:58:50 2019 +0000 |
| tree | 0966a139190e6ab03d97ec3be67c23c0cd528ba4 | |
| parent | ef356fa5bd7f7e6b658c303c6f81a8cb571e2bc7 [diff] | |
| parent | 0f6537c437481f4dcbbd8b2f673dcab67ec68e02 [diff] |
Merge "Fix ODR violation"
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",