From febbc33e9b4323785718c65b49497e88758fd4fa Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <rtmitchell@google.com>
Date: Fri, 12 Feb 2021 09:21:52 -0800
Subject: [PATCH] Remove duplicate idmap classes from services.jar

The idmap aidl classes are linked into the framework.jar. They do not
need to be linked into the services.jar as well. Remove them.

Bug: 180067820
Test: forrest
Change-Id: Ic8637794cd3a2ea39bad7c0aa6596ca9fe30c45a
---
 Android.bp               | 1 +
 services/core/Android.bp | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Android.bp b/Android.bp
index 7e68986ebeec6..0a3ca3b808ea4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -369,6 +369,7 @@ filegroup {
         ":framework_native_aidl",
         ":gatekeeper_aidl",
         ":gsiservice_aidl",
+        ":idmap2_aidl",
         ":idmap2_core_aidl",
         ":incidentcompanion_aidl",
         ":inputconstants_aidl",
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 25890b056c33e..afa08405d6429 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -81,8 +81,6 @@ java_library_static {
         ":dumpstate_aidl",
         ":framework_native_aidl",
         ":gsiservice_aidl",
-        ":idmap2_aidl",
-        ":idmap2_core_aidl",
         ":inputconstants_aidl",
         ":installd_aidl",
         ":storaged_aidl",