From 1c70cd06a824dcda49036b4c8e87da97917cfd72 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Mon, 11 Nov 2019 11:57:08 +0900
Subject: Replace framework-annotation-proc java lib with framework-all

The purpose of the java lib framework-annotation-proc is to run some
annotation processesors on source files in framework-all-sources.
However, running an annotation processor requires the compilation
of the entire source files; in fact, the output of the annotation
processors are created as byproduct of the compilation. This is a
duplicated compliation because we already are compiling the source files
for the framework-all java lib. To reduce the duplication, replacing
the references to framework-annotation-proc with framework-all, and
removing framework-annotation-proc.

Test: m
Merged-In: I449488cba235211374e2825df97aae84395e60b6
(cherry picked from commit 0b5eb9a48687d91144399f029cf136d0617a7b74)
Change-Id: I449488cba235211374e2825df97aae84395e60b6
---
 Android.bp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index 891ee91f7ed9..272cb96d8891 100644
--- a/Android.bp
+++ b/Android.bp
@@ -456,14 +456,6 @@ 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",
@@ -472,7 +464,7 @@ java_library {
 
 platform_compat_config {
     name: "framework-platform-compat-config",
-    src: ":framework-annotation-proc",
+    src: ":framework-all",
 }
 
 // A library including just UnsupportedAppUsage.java classes.
@@ -1564,7 +1556,7 @@ aidl_mapping {
 
 genrule {
     name: "framework-annotation-proc-index",
-    srcs: [":framework-annotation-proc"],
+    srcs: [":framework-all"],
     cmd: "unzip -qp $(in) unsupportedappusage/unsupportedappusage_index.csv > $(out)",
     out: ["unsupportedappusage_index.csv"],
     dist: {
-- 
cgit v1.2.3-59-g8ed1b