Merge "Add '-unstable' to solve ODR violation" into rvc-dev-plus-aosp am: 2555567ca2 am: 7cab297dc3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12377822 Change-Id: I62b57444a5e9c6e2f971cdd57e1d5d4995352617
2020-08-28 02:02:20 +00:00
parent 469175c82b 7cab297dc3
commit 7cfc3735c5
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",