Merge "Fix ODR violation"

am: ebfd2a468b

Change-Id: Id3af3d8d9c6e5b42a1ef4712171a486d9c81c8aa
This commit is contained in:
Yi Kong 2019-08-19 17:12:28 -07:00 committed by android-build-merger
commit 4a2b31f210

View file

@ -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",