Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add explicit dependency from android.test.base to hiddenapi annotations"

Browse Source
This commit is contained in:
Paul Duffin
2021-02-23 12:48:24 +00:00
committed by Gerrit Code Review
parent 9c92c37f56 67668969e8
commit d9373ecdaf
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test-base/Android.bp
View File

@@ -49,6 +49,12 @@ java_sdk_library {
compile_dex: true, compile_dex: true,
default_to_stubs: true, default_to_stubs: true,
// Additional hiddenapi annotations are provided in a separate module.
// TODO(b/180295980) - investigate whether this can be removed
hiddenapi_additional_annotations: [
"android.test.base-hiddenapi-annotations",
],
} }
// Build the android.test.base_static library // Build the android.test.base_static library
@@ -91,8 +97,9 @@ java_library_static {
// =============================================== // ===============================================
// This contains the android.test classes from android.test.base plus // This contains the android.test classes from android.test.base plus
// the com.android.internal.util.Predicate[s] classes. This is only // the com.android.internal.util.Predicate[s] classes. This is only
// intended for inclusion in android.test.legacy and must not be used // intended for inclusion in android.test.legacy and in
// elsewhere. // android.test.base-hiddenapi-annotations to avoid a dependency cycle and must
// not be used elsewhere.
java_library_static { java_library_static {
name: "android.test.base-minus-junit", name: "android.test.base-minus-junit",

15
test-base/hiddenapi/Android.bp
View File

@@ -14,11 +14,6 @@
// limitations under the License. // limitations under the License.
// //
// Provided solely to contribute information about which hidden parts of the android.test.base
// library are used by apps. The source files are stubs of the actual files in ../src which use the
// UnsupportedAppUsage annotation to tag those methods that are accessible via the hiddenapi.
// Relies on the convention that modules with name <x>-hiddenapi provide hiddenapi information for
// module <x> that is on the bootclasspath.
package { package {
// See: http://go/android-license-faq // See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import // A large-scale-change added 'default_applicable_licenses' to import
@@ -28,14 +23,20 @@ package {
default_applicable_licenses: ["frameworks_base_license"], default_applicable_licenses: ["frameworks_base_license"],
} }
// Provided solely to contribute information about which hidden parts of the android.test.base
// library are used by apps. The source files are stubs of the actual files in ../src which use the
// UnsupportedAppUsage annotation to tag those methods that are accessible via the hiddenapi.
java_library { java_library {
name: "android.test.base-hiddenapi", name: "android.test.base-hiddenapi-annotations",
compile_dex: true, compile_dex: true,
srcs: ["src/**/*.java"], srcs: ["src/**/*.java"],
libs: [ libs: [
"android.test.base", // Use this instead of `android.test.base` to avoid a dependency cycle
// as `android.test.base` depends on this.
"android.test.base-minus-junit",
"junit",
"unsupportedappusage", "unsupportedappusage",
], ],
} }