diff options
author | Anton Hansson <hansson@google.com> | 2021-02-01 11:33:47 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-02-01 11:33:47 +0000 |
commit | 1467d174dff1f5ed2867917fc1026e456776c765 (patch) | |
tree | b162d15d0c5e9af58210a0d37406e94e91d4ef52 | |
parent | b7c4df2e3f797aab65dc009d19b971350fb69b69 (diff) | |
parent | 622dc78b58827cce06d5abb914c7d6f27d28021c (diff) | |
download | base-1467d174dff1f5ed2867917fc1026e456776c765.tar.gz |
Merge changes from topic "presubmit-am-a914d38dbf2a4fd283cd25bda2526870" into mainline-prod
* changes:
Correct visibility to use __pkg__
Make framework-all composed of other framework jars
Prevent default use of framework module implementation
Set installable: false on apex jars by default
Limit build visibility of modules in apex/...
Suppress [CallbackInterface] metalava rule for mainline modules.
-rw-r--r-- | apex/Android.bp | 29 | ||||
-rw-r--r-- | apex/blobstore/framework/Android.bp | 1 | ||||
-rw-r--r-- | apex/blobstore/service/Android.bp | 5 | ||||
-rw-r--r-- | apex/jobscheduler/framework/Android.bp | 1 | ||||
-rw-r--r-- | apex/jobscheduler/service/Android.bp | 8 | ||||
-rw-r--r-- | apex/media/Android.bp | 20 | ||||
-rw-r--r-- | apex/media/framework/Android.bp | 5 | ||||
-rw-r--r-- | apex/permission/framework/Android.bp | 1 | ||||
-rw-r--r-- | apex/permission/service/Android.bp | 1 |
9 files changed, 70 insertions, 1 deletions
diff --git a/apex/Android.bp b/apex/Android.bp index 784e3a859851..29f7d80e322f 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -12,9 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_visibility: [":__subpackages__"], +} + mainline_stubs_args = "--error UnhiddenSystemApi " + "--hide BroadcastBehavior " + + "--hide CallbackInterface " + "--hide DeprecationMismatch " + "--hide HiddenSuperclass " + "--hide HiddenTypedefConstant " + @@ -79,6 +84,10 @@ java_defaults { // entry. shared_library: false, + // Prevent dependencies that do not specify an sdk_version from accessing the + // implementation library by default and force them to use stubs instead. + default_to_stubs: true, + // Enable api lint. This will eventually become the default for java_sdk_library // but it cannot yet be turned on because some usages have not been cleaned up. // TODO(b/156126315) - Remove when no longer needed. @@ -92,6 +101,10 @@ java_defaults { sdk_version: "module_current", }, + // installable implies we'll create a non-apex (platform) variant, which + // we shouldn't ordinarily need (and it can create issues), so disable that. + installable: false, + // Configure framework module specific metalava options. droiddoc_options: [mainline_stubs_args], @@ -102,7 +115,10 @@ java_defaults { stubs_library_visibility: ["//visibility:public"], // Hide impl library and stub sources - impl_library_visibility: [":__package__"], + impl_library_visibility: [ + ":__pkg__", + "//frameworks/base", // For framework-all + ], stubs_source_visibility: ["//visibility:private"], defaults_visibility: ["//visibility:private"], @@ -128,6 +144,13 @@ java_defaults { enabled: true, sdk_version: "module_current", }, + defaults_visibility: [ + ":__subpackages__", + "//frameworks/base/libs/hwui", + "//frameworks/base/wifi", + "//packages/modules:__subpackages__", + "//packages/providers/MediaProvider:__subpackages__", + ], } // Defaults for mainline module system server provided java_sdk_library instances. @@ -139,6 +162,10 @@ java_defaults { enabled: true, sdk_version: "module_current", }, + defaults_visibility: [ + ":__subpackages__", + "//packages/modules:__subpackages__", + ], } stubs_defaults { diff --git a/apex/blobstore/framework/Android.bp b/apex/blobstore/framework/Android.bp index 24693511117c..349955368b17 100644 --- a/apex/blobstore/framework/Android.bp +++ b/apex/blobstore/framework/Android.bp @@ -19,6 +19,7 @@ filegroup { "java/**/*.aidl" ], path: "java", + visibility: ["//frameworks/base"], } java_library { diff --git a/apex/blobstore/service/Android.bp b/apex/blobstore/service/Android.bp index 22b0cbe91e23..f6cbac1628da 100644 --- a/apex/blobstore/service/Android.bp +++ b/apex/blobstore/service/Android.bp @@ -25,4 +25,9 @@ java_library { "services.core", "services.usage", ], + visibility: [ + // These are required until blobstore is properly unbundled. + "//frameworks/base/services", + "//frameworks/base/services/tests/mockingservicestests", + ], } diff --git a/apex/jobscheduler/framework/Android.bp b/apex/jobscheduler/framework/Android.bp index ec074262fb13..23f5614f018c 100644 --- a/apex/jobscheduler/framework/Android.bp +++ b/apex/jobscheduler/framework/Android.bp @@ -8,6 +8,7 @@ filegroup { "java/android/os/IDeviceIdleController.aidl", ], path: "java", + visibility: ["//frameworks/base"], } java_library { diff --git a/apex/jobscheduler/service/Android.bp b/apex/jobscheduler/service/Android.bp index 69a9fd844729..6ddba690bd6f 100644 --- a/apex/jobscheduler/service/Android.bp +++ b/apex/jobscheduler/service/Android.bp @@ -13,4 +13,12 @@ java_library { "framework", "services.core", ], + visibility: [ + "//frameworks/base/apex/jobscheduler:__subpackages__", + // These are required until jobscheduler is properly unbundled. + "//frameworks/base/services", + "//frameworks/base/services/tests/mockingservicestests", + "//frameworks/base/services/tests/servicestests", + "//frameworks/base/tests/JobSchedulerPerfTests", + ], } diff --git a/apex/media/Android.bp b/apex/media/Android.bp new file mode 100644 index 000000000000..5f1bd374df00 --- /dev/null +++ b/apex/media/Android.bp @@ -0,0 +1,20 @@ +// Copyright (C) 2020 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +package { + default_visibility: [ + ":__subpackages__", + "//frameworks/av/apex", + "//frameworks/av/apex/testing", + ], +} diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp index 228e9baeba4c..faa9278709f0 100644 --- a/apex/media/framework/Android.bp +++ b/apex/media/framework/Android.bp @@ -48,6 +48,10 @@ java_library { "test_com.android.media", ], min_sdk_version: "29", + visibility: [ + "//frameworks/av/apex:__subpackages__", + "//frameworks/base", // For framework-all + ], } filegroup { @@ -57,6 +61,7 @@ filegroup { ":mediasession2-java-srcs", ":mediasession2-aidl-srcs", ], + visibility: ["//frameworks/base"], } filegroup { diff --git a/apex/permission/framework/Android.bp b/apex/permission/framework/Android.bp index c0560f61460f..36b5decbcaca 100644 --- a/apex/permission/framework/Android.bp +++ b/apex/permission/framework/Android.bp @@ -19,6 +19,7 @@ filegroup { "java/**/*.aidl", ], path: "java", + visibility: ["//frameworks/base"], } java_sdk_library { diff --git a/apex/permission/service/Android.bp b/apex/permission/service/Android.bp index b7d843352d8e..f6c315604870 100644 --- a/apex/permission/service/Android.bp +++ b/apex/permission/service/Android.bp @@ -18,6 +18,7 @@ filegroup { "java/**/*.java", ], path: "java", + visibility: ["//frameworks/base/services"], } java_sdk_library { |