From 02e7f104642adc2350b4829ae00842ed1fd78cd7 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Thu, 2 Jul 2020 16:41:45 +0100 Subject: [PATCH] Make module stubs publicly visible Previously they were limited to frameworks/base so that they could be combined into the "main" android stubs. However, limiting their visibility is inflexible and unnecessary, and due to limitations in the build system also makes it impossible to create rules for prebuilts of these module stubs that set `prefer: false`. This CL makes it possible to disable the prebuilts, which multiple downstream branches would like to do. Bug: 159902351 Test: m nothing (with prefer: false on prebuilts) Change-Id: Id0eee4bf4e78f5dfddf6ad569e49719fefde658e Merged-In: Id0eee4bf4e78f5dfddf6ad569e49719fefde658e (cherry picked from commit d346b43c1fff4b74a42258f3591812d26030c7f2) --- apex/Android.bp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apex/Android.bp b/apex/Android.bp index 5ee8a638f5403..79ab3e4e7be96 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -109,10 +109,8 @@ java_defaults { annotations_enabled: true, - // The stub libraries must be visible to frameworks/base so they can be combined - // into API specific libraries. stubs_library_visibility: [ - "//frameworks/base", // Framework + "//visibility:public", ], // Set the visibility of the modules creating the stubs source.