summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-08-28 02:57:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-28 02:57:14 +0000
commit99a44d857928a356611d5461ca78b1cbe971df8e (patch)
tree132dd941fee0969d21394d4c5d1cea7e7ad40021
parent1e19bfb91960cf16cbb1287fdaf7334715350e4d (diff)
parent7cfc3735c5e6dfceeadccd384068ec8e804f9f00 (diff)
Merge "Add '-unstable' to solve ODR violation" into rvc-dev-plus-aosp am: 2555567ca2 am: 7cab297dc3 am: 7cfc3735c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12377822 Change-Id: If65dbd2062c742d4056bf50441aeb86619d180ce
-rw-r--r--services/incremental/Android.bp6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/incremental/Android.bp b/services/incremental/Android.bp
index 7534c7c40a3d..e978ed4000e0 100644
--- a/services/incremental/Android.bp
+++ b/services/incremental/Android.bp
@@ -51,9 +51,9 @@ cc_defaults {
static_libs: [
"libbase",
"libext2_uuid",
- "libdataloader_aidl-cpp",
- "libincremental_aidl-cpp",
- "libincremental_manager_aidl-cpp",
+ "libdataloader_aidl-unstable-cpp",
+ "libincremental_aidl-unstable-cpp",
+ "libincremental_manager_aidl-unstable-cpp",
"libprotobuf-cpp-lite",
"service.incremental.proto",
"libutils",