From f0fdd6889d3e285a1d1e38ed8b2d21a11b572436 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Thu, 14 Nov 2019 03:20:36 +0000
Subject: [PATCH] Revert "Replace framework-annotation-proc java lib with
 framework-all"

This reverts commit 1c70cd06a824dcda49036b4c8e87da97917cfd72.

Reason for revert: Broke CtsAndroidTestBase28ApiSignatureTestCases
Bug: 144448055
Test: CtsAndroidTestBase28ApiSignatureTestCases

Change-Id: I1c66878a3b25e8f10c3aab34b03a95ff679d2fde
Merged-In: Ic6997f7b83318fa5d0c819c197cb5965adc31347
---
 Android.bp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Android.bp b/Android.bp
index 272cb96d88916..891ee91f7ed9e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -456,6 +456,14 @@ java_library {
     srcs: [":framework-all-sources"],
     installable: false,
     libs: ["app-compat-annotations"],
+}
+
+java_library {
+    name: "framework-annotation-proc",
+    defaults: ["framework-defaults"],
+    srcs: [":framework-all-sources"],
+    libs: ["app-compat-annotations"],
+    installable: false,
     plugins: [
         "unsupportedappusage-annotation-processor",
         "compat-changeid-annotation-processor",
@@ -464,7 +472,7 @@ java_library {
 
 platform_compat_config {
     name: "framework-platform-compat-config",
-    src: ":framework-all",
+    src: ":framework-annotation-proc",
 }
 
 // A library including just UnsupportedAppUsage.java classes.
@@ -1556,7 +1564,7 @@ aidl_mapping {
 
 genrule {
     name: "framework-annotation-proc-index",
-    srcs: [":framework-all"],
+    srcs: [":framework-annotation-proc"],
     cmd: "unzip -qp $(in) unsupportedappusage/unsupportedappusage_index.csv > $(out)",
     out: ["unsupportedappusage_index.csv"],
     dist: {