commit 486eb760ac127c5093e9966b4aa9418eb552594e
author Anton Hansson <hansson@google.com> Tue Aug 18 12:52:44 2020 +0100
committer Anton Hansson <hansson@google.com> Mon Feb 01 11:27:16 2021 +0000
tree 7a1ef0d1b6570a7092432fdc5306df821da48fa2
parent 09159170d770f2c8b53ea18030c4b5528b7d953b

Make framework-all composed of other framework jars

(partial cherry-pick)

This avoids duplicating the compilation of the module java source
code, as well as maintaining the compilation rules in two places.

Bug: 149906971
Test: m FrameworkServicesRoboTests
Change-Id: I1cea62aaedb7e653648130e3d315761c0c9aece4
Merged-In: I1cea62aaedb7e653648130e3d315761c0c9aece4

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 4de76c8..74e31cc 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -115,7 +115,10 @@
     stubs_library_visibility: ["//visibility:public"],
 
     // Hide impl library and stub sources
-    impl_library_visibility: [":__package__"],
+    impl_library_visibility: [
+        ":__package__",
+        "//frameworks/base", // For framework-all
+    ],
     stubs_source_visibility: ["//visibility:private"],
 
     defaults_visibility: ["//visibility:private"],