From f8f374a3819c53b63e965e53844ec2763ba49633 Mon Sep 17 00:00:00 2001
From: Jeongik Cha <jeongik@google.com>
Date: Fri, 14 Aug 2020 23:51:36 +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: Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424
Merged-In: Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424
Exempt-From-Owner-Approval: cp from internal
---
 Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 039f60e..71a1ccf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -88,7 +88,7 @@ cc_library_static {
         export_aidl_headers: true,
     },
     whole_static_libs: [
-        "libincremental_aidl-cpp",
+        "libincremental_aidl-unstable-cpp",
     ],
 }
 
-- 
2.11.0