Merge "Add '-unstable' to solve ODR violation" am: 68ca4e10b0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425473 Change-Id: Id76c3decd9bd0be47700653fc490d64c46190511
2020-09-11 08:40:46 +00:00
parent 75fa27a100 68ca4e10b0
commit ee0cc87d07
1 changed files with 3 additions and 3 deletions
--- 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",