summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-08-28 01:49:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-28 01:49:42 +0000
commit7cab297dc38cc4dd15aab7f60a14f44448220fa9 (patch)
tree33c16706de81a40c36052a02843039c466ec3d28
parent98eb87b770930928acc4c3464bff10fb694af20a (diff)
parent2555567ca26ace5827e7de61447cd90de0d422d8 (diff)
Merge "Add '-unstable' to solve ODR violation" into rvc-dev-plus-aosp am: 2555567ca2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12377822 Change-Id: I3166339d7a05ad7626f7f471960fbb2522bbb44e
-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",