From 2f5c545a2e821a2beab1645efdaef33aeda0194d Mon Sep 17 00:00:00 2001
From: Ioana Stefan <ioanastefan@google.com>
Date: Thu, 15 Oct 2020 15:00:24 +0200
Subject: Re-added intdef annotation processor plugin

Re-added plugin of intdefs annotation processor. The plugin was
added to a different target (`framework-minus-apex-intdefs`)
because of the refactoring of the `framework-all` target.

Generated files and command to properly merge them can be found at
go/winscope-help.

Test: run 'mp :framework-minus-apex-intdefs' and check if mapping files are properly generated
Change-Id: I295c85504246a85dea968ed26f8c05747ff5a7f7
---
 Android.bp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/Android.bp b/Android.bp
index 714b54662857..8347d3ae0479 100644
--- a/Android.bp
+++ b/Android.bp
@@ -538,8 +538,8 @@ filegroup {
     path: "core/java",
 }
 
-java_library {
-    name: "framework-minus-apex",
+java_defaults {
+    name: "framework-minus-apex-defaults",
     defaults: ["framework-aidl-export-defaults"],
     srcs: [
         ":framework-non-updatable-sources",
@@ -555,7 +555,6 @@ java_library {
         "--core-library",
         "--multi-dex",
     ],
-    installable: true,
     jarjar_rules: ":framework-jarjar-rules",
     javac_shard_size: 150,
     plugins: [
@@ -588,6 +587,12 @@ java_library {
         "mediatranscoding_aidl_interface-java",
         "soundtrigger_middleware-aidl-java",
     ],
+}
+
+java_library {
+    name: "framework-minus-apex",
+    defaults: ["framework-minus-apex-defaults"],
+    installable: true,
     // For backwards compatibility.
     stem: "framework",
     apex_available: ["//apex_available:platform"],
@@ -608,6 +613,12 @@ java_library {
     },
 }
 
+java_library {
+    name: "framework-minus-apex-intdefs",
+    defaults: ["framework-minus-apex-defaults"],
+    plugins: ["intdef-annotation-processor"],
+}
+
 // This "framework" module is NOT installed to the device. It's
 // "framework-minus-apex" that gets installed to the device. Note that
 // the filename is still framework.jar (via the stem property) for
-- 
cgit v1.2.3-59-g8ed1b