From 388d5136b51433ced37de6d812687c9020a1deb0 Mon Sep 17 00:00:00 2001
From: Jeongik Cha <jeongik@google.com>
Date: Fri, 14 Aug 2020 23:18:24 +0900
Subject: [PATCH] Add '-unstable' to solve ODR violation

The interface which is imported by an unstable interface is 'unstable'
as well. Until now, the ODR violation checker in aidl has omitted an
interface imported, but it will be checked, accordingly, fix the current
problem

Bug: 146436251
Test: m nothing
Change-Id: I3a9ae6e17e49c731e825ef00b9b9574c3f2e2719
Merged-In: I3a9ae6e17e49c731e825ef00b9b9574c3f2e2719
Exempt-From-Owner-Approval: cp from internal
---
 services/incremental/Android.bp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/incremental/Android.bp b/services/incremental/Android.bp
index 7534c7c40a3d5..e978ed4000e00 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",