diff options
author | Paul Duffin <paulduffin@google.com> | 2021-05-13 00:57:55 +0100 |
---|---|---|
committer | Paul Duffin <paulduffin@google.com> | 2021-05-13 12:40:08 +0100 |
commit | 475daafb1b309785c260ed60aadfa81c52d22adc (patch) | |
tree | 32b5f3de3931bda614a0879391be34c50c11bbde /sdk/bootclasspath_fragment_sdk_test.go | |
parent | cfd24da1f430452d8b134fd8fb18a44f4e3f796d (diff) |
Make hidden API bootclasspath_fragment test more realistic
Adds the bootclasspath_fragment to an apex and also adds an sdk library
to the stub_libs property.
Bug: 179354495
Test: m nothing
Change-Id: I2a5fffe915eb62923cc60732352d4d050dec4398
Diffstat (limited to 'sdk/bootclasspath_fragment_sdk_test.go')
-rw-r--r-- | sdk/bootclasspath_fragment_sdk_test.go | 50 |
1 files changed, 48 insertions, 2 deletions
diff --git a/sdk/bootclasspath_fragment_sdk_test.go b/sdk/bootclasspath_fragment_sdk_test.go index e91546e0b..f18e69783 100644 --- a/sdk/bootclasspath_fragment_sdk_test.go +++ b/sdk/bootclasspath_fragment_sdk_test.go @@ -384,6 +384,10 @@ func TestBasicSdkWithBootclasspathFragment(t *testing.T) { func TestSnapshotWithBootclasspathFragment_HiddenAPI(t *testing.T) { result := android.GroupFixturePreparers( prepareForSdkTestWithJava, + java.PrepareForTestWithJavaDefaultModules, + java.PrepareForTestWithJavaSdkLibraryFiles, + java.FixtureWithLastReleaseApis("mysdklibrary"), + prepareForSdkTestWithApex, android.MockFS{ "my-blocked.txt": nil, "my-max-target-o-low-priority.txt": nil, @@ -400,9 +404,20 @@ func TestSnapshotWithBootclasspathFragment_HiddenAPI(t *testing.T) { bootclasspath_fragments: ["mybootclasspathfragment"], } + apex { + name: "myapex", + key: "myapex.key", + min_sdk_version: "1", + bootclasspath_fragments: ["mybootclasspathfragment"], + } + bootclasspath_fragment { name: "mybootclasspathfragment", + apex_available: ["myapex"], contents: ["mybootlib"], + api: { + stub_libs: ["mysdklibrary"], + }, hidden_api: { unsupported: [ "my-unsupported.txt", @@ -433,11 +448,20 @@ func TestSnapshotWithBootclasspathFragment_HiddenAPI(t *testing.T) { java_library { name: "mybootlib", + apex_available: ["myapex"], srcs: ["Test.java"], system_modules: "none", sdk_version: "none", + min_sdk_version: "1", compile_dex: true, } + + java_sdk_library { + name: "mysdklibrary", + srcs: ["Test.java"], + compile_dex: true, + public: {enabled: true}, + } `), ).RunTest(t) @@ -449,8 +473,11 @@ prebuilt_bootclasspath_fragment { name: "mybootclasspathfragment", prefer: false, visibility: ["//visibility:public"], - apex_available: ["//apex_available:platform"], + apex_available: ["myapex"], contents: ["mybootlib"], + api: { + stub_libs: ["mysdklibrary"], + }, hidden_api: { unsupported: ["hiddenapi/my-unsupported.txt"], removed: ["hiddenapi/my-removed.txt"], @@ -467,9 +494,25 @@ java_import { name: "mybootlib", prefer: false, visibility: ["//visibility:public"], - apex_available: ["//apex_available:platform"], + apex_available: ["myapex"], jars: ["java/mybootlib.jar"], } + +java_sdk_library_import { + name: "mysdklibrary", + prefer: false, + visibility: ["//visibility:public"], + apex_available: ["//apex_available:platform"], + shared_library: true, + compile_dex: true, + public: { + jars: ["sdk_library/public/mysdklibrary-stubs.jar"], + stub_srcs: ["sdk_library/public/mysdklibrary_stub_sources"], + current_api: "sdk_library/public/mysdklibrary.txt", + removed_api: "sdk_library/public/mysdklibrary-removed.txt", + sdk_version: "current", + }, +} `), checkAllCopyRules(` my-unsupported.txt -> hiddenapi/my-unsupported.txt @@ -481,6 +524,9 @@ my-max-target-o-low-priority.txt -> hiddenapi/my-max-target-o-low-priority.txt my-blocked.txt -> hiddenapi/my-blocked.txt my-unsupported-packages.txt -> hiddenapi/my-unsupported-packages.txt .intermediates/mybootlib/android_common/javac/mybootlib.jar -> java/mybootlib.jar +.intermediates/mysdklibrary.stubs/android_common/javac/mysdklibrary.stubs.jar -> sdk_library/public/mysdklibrary-stubs.jar +.intermediates/mysdklibrary.stubs.source/android_common/metalava/mysdklibrary.stubs.source_api.txt -> sdk_library/public/mysdklibrary.txt +.intermediates/mysdklibrary.stubs.source/android_common/metalava/mysdklibrary.stubs.source_removed.txt -> sdk_library/public/mysdklibrary-removed.txt `), ) } |