Paul Duffin | f7f65da | 2021-03-10 15:00:46 +0000 | [diff] [blame] | 1 | // Copyright (C) 2021 The Android Open Source Project |
| 2 | // |
| 3 | // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 | // you may not use this file except in compliance with the License. |
| 5 | // You may obtain a copy of the License at |
| 6 | // |
| 7 | // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 | // |
| 9 | // Unless required by applicable law or agreed to in writing, software |
| 10 | // distributed under the License is distributed on an "AS IS" BASIS, |
| 11 | // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 | // See the License for the specific language governing permissions and |
| 13 | // limitations under the License. |
| 14 | |
| 15 | package sdk |
| 16 | |
Paul Duffin | 4a1d451 | 2021-03-18 10:12:26 +0000 | [diff] [blame] | 17 | import ( |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 18 | "fmt" |
| 19 | "path/filepath" |
Paul Duffin | 4a1d451 | 2021-03-18 10:12:26 +0000 | [diff] [blame] | 20 | "testing" |
| 21 | |
| 22 | "android/soong/android" |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 23 | "android/soong/java" |
Paul Duffin | 4a1d451 | 2021-03-18 10:12:26 +0000 | [diff] [blame] | 24 | ) |
Paul Duffin | f7f65da | 2021-03-10 15:00:46 +0000 | [diff] [blame] | 25 | |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 26 | // fixtureAddPlatformBootclasspathForBootclasspathFragment adds a platform_bootclasspath module that |
| 27 | // references the bootclasspath fragment. |
| 28 | func fixtureAddPlatformBootclasspathForBootclasspathFragment(apex, fragment string) android.FixturePreparer { |
| 29 | return android.GroupFixturePreparers( |
| 30 | // Add a platform_bootclasspath module. |
| 31 | android.FixtureAddTextFile("frameworks/base/boot/Android.bp", fmt.Sprintf(` |
| 32 | platform_bootclasspath { |
| 33 | name: "platform-bootclasspath", |
| 34 | fragments: [ |
| 35 | { |
| 36 | apex: "%s", |
| 37 | module: "%s", |
| 38 | }, |
| 39 | ], |
| 40 | } |
| 41 | `, apex, fragment)), |
| 42 | android.FixtureAddFile("frameworks/base/config/boot-profile.txt", nil), |
Jiakai Zhang | 49b1eb6 | 2021-11-26 18:09:27 +0000 | [diff] [blame] | 43 | android.FixtureAddFile("frameworks/base/config/boot-image-profile.txt", nil), |
Paul Duffin | c8ead41 | 2021-06-07 19:28:15 +0100 | [diff] [blame] | 44 | android.FixtureAddFile("build/soong/scripts/check_boot_jars/package_allowed_list.txt", nil), |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 45 | ) |
| 46 | } |
| 47 | |
| 48 | // fixtureAddPrebuiltApexForBootclasspathFragment adds a prebuilt_apex that exports the fragment. |
| 49 | func fixtureAddPrebuiltApexForBootclasspathFragment(apex, fragment string) android.FixturePreparer { |
| 50 | apexFile := fmt.Sprintf("%s.apex", apex) |
| 51 | dir := "prebuilts/apex" |
| 52 | return android.GroupFixturePreparers( |
| 53 | // A preparer to add a prebuilt apex to the test fixture. |
| 54 | android.FixtureAddTextFile(filepath.Join(dir, "Android.bp"), fmt.Sprintf(` |
| 55 | prebuilt_apex { |
| 56 | name: "%s", |
| 57 | src: "%s", |
| 58 | exported_bootclasspath_fragments: [ |
| 59 | "%s", |
| 60 | ], |
| 61 | } |
| 62 | `, apex, apexFile, fragment)), |
| 63 | android.FixtureAddFile(filepath.Join(dir, apexFile), nil), |
| 64 | ) |
| 65 | } |
| 66 | |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 67 | func TestSnapshotWithBootclasspathFragment_ImageName(t *testing.T) { |
| 68 | result := android.GroupFixturePreparers( |
| 69 | prepareForSdkTestWithJava, |
Paul Duffin | 023dba0 | 2021-04-22 01:45:29 +0100 | [diff] [blame] | 70 | java.PrepareForTestWithJavaDefaultModules, |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 71 | prepareForSdkTestWithApex, |
| 72 | |
| 73 | // Some additional files needed for the art apex. |
| 74 | android.FixtureMergeMockFs(android.MockFS{ |
| 75 | "com.android.art.avbpubkey": nil, |
| 76 | "com.android.art.pem": nil, |
| 77 | "system/sepolicy/apex/com.android.art-file_contexts": nil, |
| 78 | }), |
Paul Duffin | 023dba0 | 2021-04-22 01:45:29 +0100 | [diff] [blame] | 79 | |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 80 | // Add a platform_bootclasspath that depends on the fragment. |
| 81 | fixtureAddPlatformBootclasspathForBootclasspathFragment("com.android.art", "mybootclasspathfragment"), |
Paul Duffin | 023dba0 | 2021-04-22 01:45:29 +0100 | [diff] [blame] | 82 | |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 83 | java.FixtureConfigureBootJars("com.android.art:mybootlib"), |
| 84 | android.FixtureWithRootAndroidBp(` |
| 85 | sdk { |
| 86 | name: "mysdk", |
| 87 | bootclasspath_fragments: ["mybootclasspathfragment"], |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 88 | } |
| 89 | |
| 90 | apex { |
| 91 | name: "com.android.art", |
| 92 | key: "com.android.art.key", |
| 93 | bootclasspath_fragments: [ |
| 94 | "mybootclasspathfragment", |
| 95 | ], |
| 96 | updatable: false, |
| 97 | } |
| 98 | |
| 99 | bootclasspath_fragment { |
| 100 | name: "mybootclasspathfragment", |
| 101 | image_name: "art", |
Paul Duffin | f23bc47 | 2021-04-27 12:42:20 +0100 | [diff] [blame] | 102 | contents: ["mybootlib"], |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 103 | apex_available: ["com.android.art"], |
Paul Duffin | 9fd5647 | 2022-03-31 15:42:30 +0100 | [diff] [blame] | 104 | hidden_api: { |
| 105 | split_packages: ["*"], |
| 106 | }, |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 107 | } |
| 108 | |
| 109 | apex_key { |
| 110 | name: "com.android.art.key", |
| 111 | public_key: "com.android.art.avbpubkey", |
| 112 | private_key: "com.android.art.pem", |
| 113 | } |
| 114 | |
| 115 | java_library { |
| 116 | name: "mybootlib", |
| 117 | srcs: ["Test.java"], |
| 118 | system_modules: "none", |
| 119 | sdk_version: "none", |
| 120 | compile_dex: true, |
| 121 | apex_available: ["com.android.art"], |
| 122 | } |
| 123 | `), |
| 124 | ).RunTest(t) |
| 125 | |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 126 | // A preparer to update the test fixture used when processing an unpackage snapshot. |
| 127 | preparerForSnapshot := fixtureAddPrebuiltApexForBootclasspathFragment("com.android.art", "mybootclasspathfragment") |
Paul Duffin | 023dba0 | 2021-04-22 01:45:29 +0100 | [diff] [blame] | 128 | |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 129 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 130 | checkAndroidBpContents(` |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 131 | // This is auto-generated. DO NOT EDIT. |
| 132 | |
| 133 | prebuilt_bootclasspath_fragment { |
| 134 | name: "mybootclasspathfragment", |
| 135 | prefer: false, |
| 136 | visibility: ["//visibility:public"], |
| 137 | apex_available: ["com.android.art"], |
| 138 | image_name: "art", |
Paul Duffin | 2dc665b | 2021-04-23 16:58:51 +0100 | [diff] [blame] | 139 | contents: ["mybootlib"], |
Paul Duffin | da286f4 | 2021-06-29 11:59:23 +0100 | [diff] [blame] | 140 | hidden_api: { |
Paul Duffin | da286f4 | 2021-06-29 11:59:23 +0100 | [diff] [blame] | 141 | annotation_flags: "hiddenapi/annotation-flags.csv", |
| 142 | metadata: "hiddenapi/metadata.csv", |
| 143 | index: "hiddenapi/index.csv", |
Paul Duffin | 8d007e9 | 2021-07-22 12:00:49 +0100 | [diff] [blame] | 144 | signature_patterns: "hiddenapi/signature-patterns.csv", |
Paul Duffin | 191be3a | 2021-08-10 16:14:16 +0100 | [diff] [blame] | 145 | filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv", |
| 146 | filtered_flags: "hiddenapi/filtered-flags.csv", |
Paul Duffin | da286f4 | 2021-06-29 11:59:23 +0100 | [diff] [blame] | 147 | }, |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 148 | } |
| 149 | |
| 150 | java_import { |
| 151 | name: "mybootlib", |
| 152 | prefer: false, |
| 153 | visibility: ["//visibility:public"], |
| 154 | apex_available: ["com.android.art"], |
Paul Duffin | 5c21145 | 2021-07-15 12:42:44 +0100 | [diff] [blame] | 155 | jars: ["java_boot_libs/snapshot/jars/are/invalid/mybootlib.jar"], |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 156 | } |
| 157 | `), |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 158 | checkAllCopyRules(` |
Paul Duffin | da286f4 | 2021-06-29 11:59:23 +0100 | [diff] [blame] | 159 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/annotation-flags.csv -> hiddenapi/annotation-flags.csv |
| 160 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/metadata.csv -> hiddenapi/metadata.csv |
| 161 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/index.csv -> hiddenapi/index.csv |
Paul Duffin | 8d007e9 | 2021-07-22 12:00:49 +0100 | [diff] [blame] | 162 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/signature-patterns.csv -> hiddenapi/signature-patterns.csv |
Paul Duffin | 280bae6 | 2021-07-20 18:03:53 +0100 | [diff] [blame] | 163 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/filtered-stub-flags.csv -> hiddenapi/filtered-stub-flags.csv |
| 164 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/filtered-flags.csv -> hiddenapi/filtered-flags.csv |
Paul Duffin | 5c21145 | 2021-07-15 12:42:44 +0100 | [diff] [blame] | 165 | .intermediates/mysdk/common_os/empty -> java_boot_libs/snapshot/jars/are/invalid/mybootlib.jar |
Paul Duffin | da286f4 | 2021-06-29 11:59:23 +0100 | [diff] [blame] | 166 | `), |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 167 | snapshotTestPreparer(checkSnapshotWithoutSource, preparerForSnapshot), |
Paul Duffin | c8ead41 | 2021-06-07 19:28:15 +0100 | [diff] [blame] | 168 | |
| 169 | // Check the behavior of the snapshot without the source. |
| 170 | snapshotTestChecker(checkSnapshotWithoutSource, func(t *testing.T, result *android.TestResult) { |
| 171 | // Make sure that the boot jars package check rule includes the dex jar retrieved from the prebuilt apex. |
| 172 | checkBootJarsPackageCheckRule(t, result, "out/soong/.intermediates/prebuilts/apex/com.android.art.deapexer/android_common/deapexer/javalib/mybootlib.jar") |
| 173 | }), |
| 174 | |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 175 | snapshotTestPreparer(checkSnapshotWithSourcePreferred, preparerForSnapshot), |
| 176 | snapshotTestPreparer(checkSnapshotPreferredWithSource, preparerForSnapshot), |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 177 | ) |
Paul Duffin | c8ead41 | 2021-06-07 19:28:15 +0100 | [diff] [blame] | 178 | |
| 179 | // Make sure that the boot jars package check rule includes the dex jar created from the source. |
| 180 | checkBootJarsPackageCheckRule(t, result, "out/soong/.intermediates/mybootlib/android_common_apex10000/aligned/mybootlib.jar") |
| 181 | } |
| 182 | |
| 183 | // checkBootJarsPackageCheckRule checks that the supplied module is an input to the boot jars |
| 184 | // package check rule. |
| 185 | func checkBootJarsPackageCheckRule(t *testing.T, result *android.TestResult, expectedModule string) { |
| 186 | platformBcp := result.ModuleForTests("platform-bootclasspath", "android_common") |
| 187 | bootJarsCheckRule := platformBcp.Rule("boot_jars_package_check") |
| 188 | command := bootJarsCheckRule.RuleParams.Command |
| 189 | expectedCommandArgs := " out/soong/host/linux-x86/bin/dexdump build/soong/scripts/check_boot_jars/package_allowed_list.txt " + expectedModule + " &&" |
| 190 | android.AssertStringDoesContain(t, "boot jars package check", command, expectedCommandArgs) |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 191 | } |
| 192 | |
| 193 | func TestSnapshotWithBootClasspathFragment_Contents(t *testing.T) { |
Paul Duffin | 4a1d451 | 2021-03-18 10:12:26 +0000 | [diff] [blame] | 194 | result := android.GroupFixturePreparers( |
| 195 | prepareForSdkTestWithJava, |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 196 | java.PrepareForTestWithJavaDefaultModules, |
| 197 | java.PrepareForTestWithJavaSdkLibraryFiles, |
Paul Duffin | a10bd3c | 2021-05-12 13:46:54 +0100 | [diff] [blame] | 198 | java.FixtureWithLastReleaseApis("mysdklibrary", "myothersdklibrary", "mycoreplatform"), |
satayev | d604b21 | 2021-07-21 14:23:52 +0100 | [diff] [blame] | 199 | java.FixtureConfigureApexBootJars("myapex:mybootlib", "myapex:myothersdklibrary"), |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 200 | prepareForSdkTestWithApex, |
| 201 | |
| 202 | // Add a platform_bootclasspath that depends on the fragment. |
| 203 | fixtureAddPlatformBootclasspathForBootclasspathFragment("myapex", "mybootclasspathfragment"), |
| 204 | |
Paul Duffin | 4a1d451 | 2021-03-18 10:12:26 +0000 | [diff] [blame] | 205 | android.FixtureWithRootAndroidBp(` |
| 206 | sdk { |
| 207 | name: "mysdk", |
Paul Duffin | 0b28a8d | 2021-04-21 23:38:34 +0100 | [diff] [blame] | 208 | bootclasspath_fragments: ["mybootclasspathfragment"], |
Paul Duffin | a10bd3c | 2021-05-12 13:46:54 +0100 | [diff] [blame] | 209 | java_sdk_libs: [ |
| 210 | // This is not strictly needed as it should be automatically added to the sdk_snapshot as |
| 211 | // a java_sdk_libs module because it is used in the mybootclasspathfragment's |
| 212 | // api.stub_libs property. However, it is specified here to ensure that duplicates are |
| 213 | // correctly deduped. |
| 214 | "mysdklibrary", |
| 215 | ], |
Paul Duffin | 4a1d451 | 2021-03-18 10:12:26 +0000 | [diff] [blame] | 216 | } |
Paul Duffin | f7f65da | 2021-03-10 15:00:46 +0000 | [diff] [blame] | 217 | |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 218 | apex { |
| 219 | name: "myapex", |
| 220 | key: "myapex.key", |
| 221 | min_sdk_version: "2", |
| 222 | bootclasspath_fragments: ["mybootclasspathfragment"], |
| 223 | } |
| 224 | |
Paul Duffin | 0b28a8d | 2021-04-21 23:38:34 +0100 | [diff] [blame] | 225 | bootclasspath_fragment { |
| 226 | name: "mybootclasspathfragment", |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 227 | apex_available: ["myapex"], |
Paul Duffin | a10bd3c | 2021-05-12 13:46:54 +0100 | [diff] [blame] | 228 | contents: [ |
| 229 | // This should be automatically added to the sdk_snapshot as a java_boot_libs module. |
| 230 | "mybootlib", |
| 231 | // This should be automatically added to the sdk_snapshot as a java_sdk_libs module. |
| 232 | "myothersdklibrary", |
| 233 | ], |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 234 | api: { |
| 235 | stub_libs: ["mysdklibrary"], |
| 236 | }, |
| 237 | core_platform_api: { |
Paul Duffin | a10bd3c | 2021-05-12 13:46:54 +0100 | [diff] [blame] | 238 | // This should be automatically added to the sdk_snapshot as a java_sdk_libs module. |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 239 | stub_libs: ["mycoreplatform"], |
| 240 | }, |
Paul Duffin | 9fd5647 | 2022-03-31 15:42:30 +0100 | [diff] [blame] | 241 | hidden_api: { |
| 242 | split_packages: ["*"], |
| 243 | }, |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 244 | } |
| 245 | |
| 246 | java_library { |
| 247 | name: "mybootlib", |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 248 | apex_available: ["myapex"], |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 249 | srcs: ["Test.java"], |
| 250 | system_modules: "none", |
| 251 | sdk_version: "none", |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 252 | min_sdk_version: "2", |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 253 | compile_dex: true, |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 254 | permitted_packages: ["mybootlib"], |
Paul Duffin | 4a1d451 | 2021-03-18 10:12:26 +0000 | [diff] [blame] | 255 | } |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 256 | |
| 257 | java_sdk_library { |
| 258 | name: "mysdklibrary", |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 259 | apex_available: ["myapex"], |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 260 | srcs: ["Test.java"], |
Paul Duffin | f4600f6 | 2021-05-13 22:34:45 +0100 | [diff] [blame] | 261 | shared_library: false, |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 262 | public: {enabled: true}, |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 263 | min_sdk_version: "2", |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 264 | } |
| 265 | |
| 266 | java_sdk_library { |
Paul Duffin | a10bd3c | 2021-05-12 13:46:54 +0100 | [diff] [blame] | 267 | name: "myothersdklibrary", |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 268 | apex_available: ["myapex"], |
Paul Duffin | a10bd3c | 2021-05-12 13:46:54 +0100 | [diff] [blame] | 269 | srcs: ["Test.java"], |
Paul Duffin | ea8f808 | 2021-06-24 13:25:57 +0100 | [diff] [blame] | 270 | compile_dex: true, |
Paul Duffin | a10bd3c | 2021-05-12 13:46:54 +0100 | [diff] [blame] | 271 | public: {enabled: true}, |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 272 | min_sdk_version: "2", |
| 273 | permitted_packages: ["myothersdklibrary"], |
Paul Duffin | a10bd3c | 2021-05-12 13:46:54 +0100 | [diff] [blame] | 274 | } |
| 275 | |
| 276 | java_sdk_library { |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 277 | name: "mycoreplatform", |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 278 | apex_available: ["myapex"], |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 279 | srcs: ["Test.java"], |
Paul Duffin | ea8f808 | 2021-06-24 13:25:57 +0100 | [diff] [blame] | 280 | compile_dex: true, |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 281 | public: {enabled: true}, |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 282 | min_sdk_version: "2", |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 283 | } |
Paul Duffin | 4a1d451 | 2021-03-18 10:12:26 +0000 | [diff] [blame] | 284 | `), |
| 285 | ).RunTest(t) |
Paul Duffin | f7f65da | 2021-03-10 15:00:46 +0000 | [diff] [blame] | 286 | |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 287 | // A preparer to update the test fixture used when processing an unpackage snapshot. |
| 288 | preparerForSnapshot := fixtureAddPrebuiltApexForBootclasspathFragment("myapex", "mybootclasspathfragment") |
| 289 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 290 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 291 | checkAndroidBpContents(` |
Paul Duffin | f7f65da | 2021-03-10 15:00:46 +0000 | [diff] [blame] | 292 | // This is auto-generated. DO NOT EDIT. |
| 293 | |
Paul Duffin | 0b28a8d | 2021-04-21 23:38:34 +0100 | [diff] [blame] | 294 | prebuilt_bootclasspath_fragment { |
| 295 | name: "mybootclasspathfragment", |
Paul Duffin | f7f65da | 2021-03-10 15:00:46 +0000 | [diff] [blame] | 296 | prefer: false, |
| 297 | visibility: ["//visibility:public"], |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 298 | apex_available: ["myapex"], |
Paul Duffin | a10bd3c | 2021-05-12 13:46:54 +0100 | [diff] [blame] | 299 | contents: [ |
| 300 | "mybootlib", |
| 301 | "myothersdklibrary", |
| 302 | ], |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 303 | api: { |
| 304 | stub_libs: ["mysdklibrary"], |
| 305 | }, |
| 306 | core_platform_api: { |
| 307 | stub_libs: ["mycoreplatform"], |
| 308 | }, |
Paul Duffin | 2fef136 | 2021-04-15 13:32:00 +0100 | [diff] [blame] | 309 | hidden_api: { |
Paul Duffin | 2fef136 | 2021-04-15 13:32:00 +0100 | [diff] [blame] | 310 | annotation_flags: "hiddenapi/annotation-flags.csv", |
| 311 | metadata: "hiddenapi/metadata.csv", |
| 312 | index: "hiddenapi/index.csv", |
Paul Duffin | 8d007e9 | 2021-07-22 12:00:49 +0100 | [diff] [blame] | 313 | signature_patterns: "hiddenapi/signature-patterns.csv", |
Paul Duffin | 191be3a | 2021-08-10 16:14:16 +0100 | [diff] [blame] | 314 | filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv", |
| 315 | filtered_flags: "hiddenapi/filtered-flags.csv", |
Paul Duffin | 2fef136 | 2021-04-15 13:32:00 +0100 | [diff] [blame] | 316 | }, |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 317 | } |
| 318 | |
| 319 | java_import { |
| 320 | name: "mybootlib", |
| 321 | prefer: false, |
| 322 | visibility: ["//visibility:public"], |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 323 | apex_available: ["myapex"], |
Paul Duffin | 5c21145 | 2021-07-15 12:42:44 +0100 | [diff] [blame] | 324 | jars: ["java_boot_libs/snapshot/jars/are/invalid/mybootlib.jar"], |
Paul Duffin | 869de14 | 2021-07-15 14:14:41 +0100 | [diff] [blame] | 325 | permitted_packages: ["mybootlib"], |
Paul Duffin | f7f65da | 2021-03-10 15:00:46 +0000 | [diff] [blame] | 326 | } |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 327 | |
| 328 | java_sdk_library_import { |
Paul Duffin | a10bd3c | 2021-05-12 13:46:54 +0100 | [diff] [blame] | 329 | name: "myothersdklibrary", |
| 330 | prefer: false, |
| 331 | visibility: ["//visibility:public"], |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 332 | apex_available: ["myapex"], |
Paul Duffin | ea8f808 | 2021-06-24 13:25:57 +0100 | [diff] [blame] | 333 | shared_library: true, |
| 334 | compile_dex: true, |
Paul Duffin | 869de14 | 2021-07-15 14:14:41 +0100 | [diff] [blame] | 335 | permitted_packages: ["myothersdklibrary"], |
Paul Duffin | a10bd3c | 2021-05-12 13:46:54 +0100 | [diff] [blame] | 336 | public: { |
| 337 | jars: ["sdk_library/public/myothersdklibrary-stubs.jar"], |
| 338 | stub_srcs: ["sdk_library/public/myothersdklibrary_stub_sources"], |
| 339 | current_api: "sdk_library/public/myothersdklibrary.txt", |
| 340 | removed_api: "sdk_library/public/myothersdklibrary-removed.txt", |
| 341 | sdk_version: "current", |
| 342 | }, |
| 343 | } |
| 344 | |
| 345 | java_sdk_library_import { |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 346 | name: "mysdklibrary", |
| 347 | prefer: false, |
| 348 | visibility: ["//visibility:public"], |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 349 | apex_available: ["myapex"], |
Paul Duffin | f4600f6 | 2021-05-13 22:34:45 +0100 | [diff] [blame] | 350 | shared_library: false, |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 351 | public: { |
| 352 | jars: ["sdk_library/public/mysdklibrary-stubs.jar"], |
| 353 | stub_srcs: ["sdk_library/public/mysdklibrary_stub_sources"], |
| 354 | current_api: "sdk_library/public/mysdklibrary.txt", |
| 355 | removed_api: "sdk_library/public/mysdklibrary-removed.txt", |
| 356 | sdk_version: "current", |
| 357 | }, |
| 358 | } |
| 359 | |
| 360 | java_sdk_library_import { |
| 361 | name: "mycoreplatform", |
| 362 | prefer: false, |
| 363 | visibility: ["//visibility:public"], |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 364 | apex_available: ["myapex"], |
Paul Duffin | ea8f808 | 2021-06-24 13:25:57 +0100 | [diff] [blame] | 365 | shared_library: true, |
| 366 | compile_dex: true, |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 367 | public: { |
| 368 | jars: ["sdk_library/public/mycoreplatform-stubs.jar"], |
| 369 | stub_srcs: ["sdk_library/public/mycoreplatform_stub_sources"], |
| 370 | current_api: "sdk_library/public/mycoreplatform.txt", |
| 371 | removed_api: "sdk_library/public/mycoreplatform-removed.txt", |
| 372 | sdk_version: "current", |
| 373 | }, |
| 374 | } |
Paul Duffin | a10bd3c | 2021-05-12 13:46:54 +0100 | [diff] [blame] | 375 | `), |
Paul Duffin | a57835e | 2021-04-19 13:23:06 +0100 | [diff] [blame] | 376 | checkAllCopyRules(` |
Paul Duffin | 2fef136 | 2021-04-15 13:32:00 +0100 | [diff] [blame] | 377 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/annotation-flags.csv -> hiddenapi/annotation-flags.csv |
| 378 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/metadata.csv -> hiddenapi/metadata.csv |
| 379 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/index.csv -> hiddenapi/index.csv |
Paul Duffin | 8d007e9 | 2021-07-22 12:00:49 +0100 | [diff] [blame] | 380 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/signature-patterns.csv -> hiddenapi/signature-patterns.csv |
Paul Duffin | 280bae6 | 2021-07-20 18:03:53 +0100 | [diff] [blame] | 381 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/filtered-stub-flags.csv -> hiddenapi/filtered-stub-flags.csv |
| 382 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/filtered-flags.csv -> hiddenapi/filtered-flags.csv |
Paul Duffin | 5c21145 | 2021-07-15 12:42:44 +0100 | [diff] [blame] | 383 | .intermediates/mysdk/common_os/empty -> java_boot_libs/snapshot/jars/are/invalid/mybootlib.jar |
Paul Duffin | a10bd3c | 2021-05-12 13:46:54 +0100 | [diff] [blame] | 384 | .intermediates/myothersdklibrary.stubs/android_common/javac/myothersdklibrary.stubs.jar -> sdk_library/public/myothersdklibrary-stubs.jar |
| 385 | .intermediates/myothersdklibrary.stubs.source/android_common/metalava/myothersdklibrary.stubs.source_api.txt -> sdk_library/public/myothersdklibrary.txt |
| 386 | .intermediates/myothersdklibrary.stubs.source/android_common/metalava/myothersdklibrary.stubs.source_removed.txt -> sdk_library/public/myothersdklibrary-removed.txt |
Paul Duffin | 895c714 | 2021-04-25 13:40:15 +0100 | [diff] [blame] | 387 | .intermediates/mysdklibrary.stubs/android_common/javac/mysdklibrary.stubs.jar -> sdk_library/public/mysdklibrary-stubs.jar |
| 388 | .intermediates/mysdklibrary.stubs.source/android_common/metalava/mysdklibrary.stubs.source_api.txt -> sdk_library/public/mysdklibrary.txt |
| 389 | .intermediates/mysdklibrary.stubs.source/android_common/metalava/mysdklibrary.stubs.source_removed.txt -> sdk_library/public/mysdklibrary-removed.txt |
| 390 | .intermediates/mycoreplatform.stubs/android_common/javac/mycoreplatform.stubs.jar -> sdk_library/public/mycoreplatform-stubs.jar |
| 391 | .intermediates/mycoreplatform.stubs.source/android_common/metalava/mycoreplatform.stubs.source_api.txt -> sdk_library/public/mycoreplatform.txt |
| 392 | .intermediates/mycoreplatform.stubs.source/android_common/metalava/mycoreplatform.stubs.source_removed.txt -> sdk_library/public/mycoreplatform-removed.txt |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 393 | `), |
| 394 | snapshotTestPreparer(checkSnapshotWithoutSource, preparerForSnapshot), |
Paul Duffin | d061d40 | 2021-06-07 21:36:01 +0100 | [diff] [blame] | 395 | snapshotTestChecker(checkSnapshotWithoutSource, func(t *testing.T, result *android.TestResult) { |
| 396 | module := result.ModuleForTests("platform-bootclasspath", "android_common") |
| 397 | var rule android.TestingBuildParams |
| 398 | rule = module.Output("out/soong/hiddenapi/hiddenapi-flags.csv") |
| 399 | java.CheckHiddenAPIRuleInputs(t, "monolithic flags", ` |
| 400 | out/soong/.intermediates/frameworks/base/boot/platform-bootclasspath/android_common/hiddenapi-monolithic/annotation-flags-from-classes.csv |
| 401 | out/soong/hiddenapi/hiddenapi-stub-flags.txt |
| 402 | snapshot/hiddenapi/annotation-flags.csv |
| 403 | `, rule) |
| 404 | |
| 405 | rule = module.Output("out/soong/hiddenapi/hiddenapi-unsupported.csv") |
| 406 | java.CheckHiddenAPIRuleInputs(t, "monolithic metadata", ` |
| 407 | out/soong/.intermediates/frameworks/base/boot/platform-bootclasspath/android_common/hiddenapi-monolithic/metadata-from-classes.csv |
| 408 | snapshot/hiddenapi/metadata.csv |
| 409 | `, rule) |
| 410 | |
| 411 | rule = module.Output("out/soong/hiddenapi/hiddenapi-index.csv") |
| 412 | java.CheckHiddenAPIRuleInputs(t, "monolithic index", ` |
| 413 | out/soong/.intermediates/frameworks/base/boot/platform-bootclasspath/android_common/hiddenapi-monolithic/index-from-classes.csv |
| 414 | snapshot/hiddenapi/index.csv |
| 415 | `, rule) |
Paul Duffin | 630b11e | 2021-07-15 13:35:26 +0100 | [diff] [blame] | 416 | |
Paul Duffin | 8d007e9 | 2021-07-22 12:00:49 +0100 | [diff] [blame] | 417 | rule = module.Output("out/soong/hiddenapi/hiddenapi-flags.csv.valid") |
Paul Duffin | 280bae6 | 2021-07-20 18:03:53 +0100 | [diff] [blame] | 418 | android.AssertStringDoesContain(t, "verify-overlaps", rule.RuleParams.Command, " snapshot/hiddenapi/filtered-flags.csv:snapshot/hiddenapi/signature-patterns.csv ") |
Paul Duffin | d061d40 | 2021-06-07 21:36:01 +0100 | [diff] [blame] | 419 | }), |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 420 | snapshotTestPreparer(checkSnapshotWithSourcePreferred, preparerForSnapshot), |
Paul Duffin | 8d007e9 | 2021-07-22 12:00:49 +0100 | [diff] [blame] | 421 | snapshotTestChecker(checkSnapshotWithSourcePreferred, func(t *testing.T, result *android.TestResult) { |
| 422 | module := result.ModuleForTests("platform-bootclasspath", "android_common") |
| 423 | rule := module.Output("out/soong/hiddenapi/hiddenapi-flags.csv.valid") |
Paul Duffin | 280bae6 | 2021-07-20 18:03:53 +0100 | [diff] [blame] | 424 | android.AssertStringDoesContain(t, "verify-overlaps", rule.RuleParams.Command, " out/soong/.intermediates/mybootclasspathfragment/android_common_myapex/modular-hiddenapi/filtered-flags.csv:out/soong/.intermediates/mybootclasspathfragment/android_common_myapex/modular-hiddenapi/signature-patterns.csv ") |
Paul Duffin | 8d007e9 | 2021-07-22 12:00:49 +0100 | [diff] [blame] | 425 | }), |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 426 | snapshotTestPreparer(checkSnapshotPreferredWithSource, preparerForSnapshot), |
| 427 | ) |
Paul Duffin | f7f65da | 2021-03-10 15:00:46 +0000 | [diff] [blame] | 428 | } |
Paul Duffin | 04b4a19 | 2021-03-18 11:05:31 +0000 | [diff] [blame] | 429 | |
Paul Duffin | 51227d8 | 2021-05-18 12:54:27 +0100 | [diff] [blame] | 430 | // TestSnapshotWithBootClasspathFragment_Fragments makes sure that the fragments property of a |
| 431 | // bootclasspath_fragment is correctly output to the sdk snapshot. |
| 432 | func TestSnapshotWithBootClasspathFragment_Fragments(t *testing.T) { |
| 433 | result := android.GroupFixturePreparers( |
| 434 | prepareForSdkTestWithJava, |
| 435 | java.PrepareForTestWithJavaDefaultModules, |
| 436 | java.PrepareForTestWithJavaSdkLibraryFiles, |
| 437 | java.FixtureWithLastReleaseApis("mysdklibrary", "myothersdklibrary"), |
satayev | abcd597 | 2021-08-06 17:49:46 +0100 | [diff] [blame] | 438 | java.FixtureConfigureApexBootJars("someapex:mysdklibrary", "myotherapex:myotherlib"), |
Paul Duffin | 51227d8 | 2021-05-18 12:54:27 +0100 | [diff] [blame] | 439 | prepareForSdkTestWithApex, |
| 440 | |
| 441 | // Some additional files needed for the myotherapex. |
| 442 | android.FixtureMergeMockFs(android.MockFS{ |
| 443 | "system/sepolicy/apex/myotherapex-file_contexts": nil, |
| 444 | "myotherapex/apex_manifest.json": nil, |
| 445 | "myotherapex/Test.java": nil, |
| 446 | }), |
| 447 | |
| 448 | android.FixtureAddTextFile("myotherapex/Android.bp", ` |
| 449 | apex { |
| 450 | name: "myotherapex", |
| 451 | key: "myapex.key", |
| 452 | min_sdk_version: "2", |
| 453 | bootclasspath_fragments: ["myotherbootclasspathfragment"], |
| 454 | } |
| 455 | |
| 456 | bootclasspath_fragment { |
| 457 | name: "myotherbootclasspathfragment", |
| 458 | apex_available: ["myotherapex"], |
| 459 | contents: [ |
| 460 | "myotherlib", |
| 461 | ], |
Paul Duffin | 9fd5647 | 2022-03-31 15:42:30 +0100 | [diff] [blame] | 462 | hidden_api: { |
| 463 | split_packages: ["*"], |
| 464 | }, |
Paul Duffin | 51227d8 | 2021-05-18 12:54:27 +0100 | [diff] [blame] | 465 | } |
| 466 | |
| 467 | java_library { |
| 468 | name: "myotherlib", |
| 469 | apex_available: ["myotherapex"], |
| 470 | srcs: ["Test.java"], |
| 471 | min_sdk_version: "2", |
| 472 | permitted_packages: ["myothersdklibrary"], |
| 473 | compile_dex: true, |
| 474 | } |
| 475 | `), |
| 476 | |
| 477 | android.FixtureWithRootAndroidBp(` |
| 478 | sdk { |
| 479 | name: "mysdk", |
| 480 | bootclasspath_fragments: ["mybootclasspathfragment"], |
| 481 | } |
| 482 | |
| 483 | bootclasspath_fragment { |
| 484 | name: "mybootclasspathfragment", |
| 485 | contents: [ |
| 486 | "mysdklibrary", |
| 487 | ], |
| 488 | fragments: [ |
| 489 | { |
| 490 | apex: "myotherapex", |
| 491 | module: "myotherbootclasspathfragment" |
| 492 | }, |
| 493 | ], |
Paul Duffin | 9fd5647 | 2022-03-31 15:42:30 +0100 | [diff] [blame] | 494 | hidden_api: { |
| 495 | split_packages: ["*"], |
| 496 | }, |
Paul Duffin | 51227d8 | 2021-05-18 12:54:27 +0100 | [diff] [blame] | 497 | } |
| 498 | |
| 499 | java_sdk_library { |
| 500 | name: "mysdklibrary", |
| 501 | srcs: ["Test.java"], |
| 502 | shared_library: false, |
| 503 | public: {enabled: true}, |
| 504 | min_sdk_version: "2", |
| 505 | } |
| 506 | `), |
| 507 | ).RunTest(t) |
| 508 | |
| 509 | // A preparer to update the test fixture used when processing an unpackage snapshot. |
| 510 | preparerForSnapshot := fixtureAddPrebuiltApexForBootclasspathFragment("myapex", "mybootclasspathfragment") |
| 511 | |
| 512 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 513 | checkAndroidBpContents(` |
Paul Duffin | 51227d8 | 2021-05-18 12:54:27 +0100 | [diff] [blame] | 514 | // This is auto-generated. DO NOT EDIT. |
| 515 | |
| 516 | prebuilt_bootclasspath_fragment { |
| 517 | name: "mybootclasspathfragment", |
| 518 | prefer: false, |
| 519 | visibility: ["//visibility:public"], |
| 520 | apex_available: ["//apex_available:platform"], |
| 521 | contents: ["mysdklibrary"], |
| 522 | fragments: [ |
| 523 | { |
| 524 | apex: "myotherapex", |
| 525 | module: "myotherbootclasspathfragment", |
| 526 | }, |
| 527 | ], |
| 528 | hidden_api: { |
Paul Duffin | 51227d8 | 2021-05-18 12:54:27 +0100 | [diff] [blame] | 529 | annotation_flags: "hiddenapi/annotation-flags.csv", |
| 530 | metadata: "hiddenapi/metadata.csv", |
| 531 | index: "hiddenapi/index.csv", |
Paul Duffin | 8d007e9 | 2021-07-22 12:00:49 +0100 | [diff] [blame] | 532 | signature_patterns: "hiddenapi/signature-patterns.csv", |
Paul Duffin | 191be3a | 2021-08-10 16:14:16 +0100 | [diff] [blame] | 533 | filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv", |
| 534 | filtered_flags: "hiddenapi/filtered-flags.csv", |
Paul Duffin | 51227d8 | 2021-05-18 12:54:27 +0100 | [diff] [blame] | 535 | }, |
| 536 | } |
| 537 | |
| 538 | java_sdk_library_import { |
| 539 | name: "mysdklibrary", |
| 540 | prefer: false, |
| 541 | visibility: ["//visibility:public"], |
| 542 | apex_available: ["//apex_available:platform"], |
| 543 | shared_library: false, |
| 544 | public: { |
| 545 | jars: ["sdk_library/public/mysdklibrary-stubs.jar"], |
| 546 | stub_srcs: ["sdk_library/public/mysdklibrary_stub_sources"], |
| 547 | current_api: "sdk_library/public/mysdklibrary.txt", |
| 548 | removed_api: "sdk_library/public/mysdklibrary-removed.txt", |
| 549 | sdk_version: "current", |
| 550 | }, |
| 551 | } |
| 552 | `), |
| 553 | snapshotTestPreparer(checkSnapshotWithoutSource, preparerForSnapshot), |
| 554 | snapshotTestPreparer(checkSnapshotWithSourcePreferred, preparerForSnapshot), |
| 555 | snapshotTestPreparer(checkSnapshotPreferredWithSource, preparerForSnapshot), |
| 556 | ) |
| 557 | } |
| 558 | |
Paul Duffin | 0b28a8d | 2021-04-21 23:38:34 +0100 | [diff] [blame] | 559 | // Test that bootclasspath_fragment works with sdk. |
| 560 | func TestBasicSdkWithBootclasspathFragment(t *testing.T) { |
Paul Duffin | 04b4a19 | 2021-03-18 11:05:31 +0000 | [diff] [blame] | 561 | android.GroupFixturePreparers( |
| 562 | prepareForSdkTestWithApex, |
| 563 | prepareForSdkTestWithJava, |
Paul Duffin | 8018e50 | 2021-05-21 19:28:09 +0100 | [diff] [blame] | 564 | android.FixtureAddFile("java/mybootlib.jar", nil), |
Paul Duffin | 04b4a19 | 2021-03-18 11:05:31 +0000 | [diff] [blame] | 565 | android.FixtureWithRootAndroidBp(` |
| 566 | sdk { |
| 567 | name: "mysdk", |
Paul Duffin | 0b28a8d | 2021-04-21 23:38:34 +0100 | [diff] [blame] | 568 | bootclasspath_fragments: ["mybootclasspathfragment"], |
Paul Duffin | 04b4a19 | 2021-03-18 11:05:31 +0000 | [diff] [blame] | 569 | } |
| 570 | |
Paul Duffin | 0b28a8d | 2021-04-21 23:38:34 +0100 | [diff] [blame] | 571 | bootclasspath_fragment { |
| 572 | name: "mybootclasspathfragment", |
Paul Duffin | 04b4a19 | 2021-03-18 11:05:31 +0000 | [diff] [blame] | 573 | image_name: "art", |
Paul Duffin | 8018e50 | 2021-05-21 19:28:09 +0100 | [diff] [blame] | 574 | contents: ["mybootlib"], |
Paul Duffin | 04b4a19 | 2021-03-18 11:05:31 +0000 | [diff] [blame] | 575 | apex_available: ["myapex"], |
Paul Duffin | 9fd5647 | 2022-03-31 15:42:30 +0100 | [diff] [blame] | 576 | hidden_api: { |
| 577 | split_packages: ["*"], |
| 578 | }, |
Paul Duffin | 04b4a19 | 2021-03-18 11:05:31 +0000 | [diff] [blame] | 579 | } |
| 580 | |
Paul Duffin | 8018e50 | 2021-05-21 19:28:09 +0100 | [diff] [blame] | 581 | java_library { |
| 582 | name: "mybootlib", |
| 583 | apex_available: ["myapex"], |
| 584 | srcs: ["Test.java"], |
| 585 | system_modules: "none", |
| 586 | sdk_version: "none", |
| 587 | min_sdk_version: "1", |
| 588 | compile_dex: true, |
| 589 | } |
| 590 | |
Paul Duffin | 04b4a19 | 2021-03-18 11:05:31 +0000 | [diff] [blame] | 591 | sdk_snapshot { |
| 592 | name: "mysdk@1", |
Paul Duffin | 8018e50 | 2021-05-21 19:28:09 +0100 | [diff] [blame] | 593 | bootclasspath_fragments: ["mysdk_mybootclasspathfragment@1"], |
Paul Duffin | 04b4a19 | 2021-03-18 11:05:31 +0000 | [diff] [blame] | 594 | } |
| 595 | |
Paul Duffin | 0b28a8d | 2021-04-21 23:38:34 +0100 | [diff] [blame] | 596 | prebuilt_bootclasspath_fragment { |
Paul Duffin | 8018e50 | 2021-05-21 19:28:09 +0100 | [diff] [blame] | 597 | name: "mysdk_mybootclasspathfragment@1", |
Paul Duffin | 0b28a8d | 2021-04-21 23:38:34 +0100 | [diff] [blame] | 598 | sdk_member_name: "mybootclasspathfragment", |
Paul Duffin | 04b4a19 | 2021-03-18 11:05:31 +0000 | [diff] [blame] | 599 | prefer: false, |
| 600 | visibility: ["//visibility:public"], |
| 601 | apex_available: [ |
| 602 | "myapex", |
| 603 | ], |
| 604 | image_name: "art", |
Paul Duffin | 8018e50 | 2021-05-21 19:28:09 +0100 | [diff] [blame] | 605 | contents: ["mysdk_mybootlib@1"], |
| 606 | } |
| 607 | |
| 608 | java_import { |
| 609 | name: "mysdk_mybootlib@1", |
| 610 | sdk_member_name: "mybootlib", |
| 611 | visibility: ["//visibility:public"], |
| 612 | apex_available: ["com.android.art"], |
| 613 | jars: ["java/mybootlib.jar"], |
Paul Duffin | 04b4a19 | 2021-03-18 11:05:31 +0000 | [diff] [blame] | 614 | } |
| 615 | `), |
| 616 | ).RunTest(t) |
| 617 | } |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 618 | |
| 619 | func TestSnapshotWithBootclasspathFragment_HiddenAPI(t *testing.T) { |
| 620 | result := android.GroupFixturePreparers( |
| 621 | prepareForSdkTestWithJava, |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 622 | java.PrepareForTestWithJavaDefaultModules, |
| 623 | java.PrepareForTestWithJavaSdkLibraryFiles, |
| 624 | java.FixtureWithLastReleaseApis("mysdklibrary"), |
satayev | d604b21 | 2021-07-21 14:23:52 +0100 | [diff] [blame] | 625 | java.FixtureConfigureApexBootJars("myapex:mybootlib"), |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 626 | prepareForSdkTestWithApex, |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 627 | |
| 628 | // Add a platform_bootclasspath that depends on the fragment. |
| 629 | fixtureAddPlatformBootclasspathForBootclasspathFragment("myapex", "mybootclasspathfragment"), |
| 630 | |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 631 | android.MockFS{ |
| 632 | "my-blocked.txt": nil, |
| 633 | "my-max-target-o-low-priority.txt": nil, |
| 634 | "my-max-target-p.txt": nil, |
| 635 | "my-max-target-q.txt": nil, |
| 636 | "my-max-target-r-low-priority.txt": nil, |
| 637 | "my-removed.txt": nil, |
| 638 | "my-unsupported-packages.txt": nil, |
| 639 | "my-unsupported.txt": nil, |
| 640 | }.AddToFixture(), |
| 641 | android.FixtureWithRootAndroidBp(` |
| 642 | sdk { |
| 643 | name: "mysdk", |
| 644 | bootclasspath_fragments: ["mybootclasspathfragment"], |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 645 | } |
| 646 | |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 647 | apex { |
| 648 | name: "myapex", |
| 649 | key: "myapex.key", |
| 650 | min_sdk_version: "1", |
| 651 | bootclasspath_fragments: ["mybootclasspathfragment"], |
| 652 | } |
| 653 | |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 654 | bootclasspath_fragment { |
| 655 | name: "mybootclasspathfragment", |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 656 | apex_available: ["myapex"], |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 657 | contents: ["mybootlib"], |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 658 | api: { |
| 659 | stub_libs: ["mysdklibrary"], |
| 660 | }, |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 661 | hidden_api: { |
| 662 | unsupported: [ |
| 663 | "my-unsupported.txt", |
| 664 | ], |
| 665 | removed: [ |
| 666 | "my-removed.txt", |
| 667 | ], |
| 668 | max_target_r_low_priority: [ |
| 669 | "my-max-target-r-low-priority.txt", |
| 670 | ], |
| 671 | max_target_q: [ |
| 672 | "my-max-target-q.txt", |
| 673 | ], |
| 674 | max_target_p: [ |
| 675 | "my-max-target-p.txt", |
| 676 | ], |
| 677 | max_target_o_low_priority: [ |
| 678 | "my-max-target-o-low-priority.txt", |
| 679 | ], |
| 680 | blocked: [ |
| 681 | "my-blocked.txt", |
| 682 | ], |
| 683 | unsupported_packages: [ |
| 684 | "my-unsupported-packages.txt", |
| 685 | ], |
Paul Duffin | 9fd5647 | 2022-03-31 15:42:30 +0100 | [diff] [blame] | 686 | split_packages: ["*"], |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 687 | }, |
| 688 | } |
| 689 | |
| 690 | java_library { |
| 691 | name: "mybootlib", |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 692 | apex_available: ["myapex"], |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 693 | srcs: ["Test.java"], |
| 694 | system_modules: "none", |
| 695 | sdk_version: "none", |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 696 | min_sdk_version: "1", |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 697 | compile_dex: true, |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 698 | permitted_packages: ["mybootlib"], |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 699 | } |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 700 | |
| 701 | java_sdk_library { |
| 702 | name: "mysdklibrary", |
| 703 | srcs: ["Test.java"], |
| 704 | compile_dex: true, |
| 705 | public: {enabled: true}, |
Paul Duffin | 869de14 | 2021-07-15 14:14:41 +0100 | [diff] [blame] | 706 | permitted_packages: ["mysdklibrary"], |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 707 | } |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 708 | `), |
| 709 | ).RunTest(t) |
| 710 | |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 711 | // A preparer to update the test fixture used when processing an unpackage snapshot. |
| 712 | preparerForSnapshot := fixtureAddPrebuiltApexForBootclasspathFragment("myapex", "mybootclasspathfragment") |
| 713 | |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 714 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 715 | checkAndroidBpContents(` |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 716 | // This is auto-generated. DO NOT EDIT. |
| 717 | |
| 718 | prebuilt_bootclasspath_fragment { |
| 719 | name: "mybootclasspathfragment", |
| 720 | prefer: false, |
| 721 | visibility: ["//visibility:public"], |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 722 | apex_available: ["myapex"], |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 723 | contents: ["mybootlib"], |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 724 | api: { |
| 725 | stub_libs: ["mysdklibrary"], |
| 726 | }, |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 727 | hidden_api: { |
| 728 | unsupported: ["hiddenapi/my-unsupported.txt"], |
| 729 | removed: ["hiddenapi/my-removed.txt"], |
| 730 | max_target_r_low_priority: ["hiddenapi/my-max-target-r-low-priority.txt"], |
| 731 | max_target_q: ["hiddenapi/my-max-target-q.txt"], |
| 732 | max_target_p: ["hiddenapi/my-max-target-p.txt"], |
| 733 | max_target_o_low_priority: ["hiddenapi/my-max-target-o-low-priority.txt"], |
| 734 | blocked: ["hiddenapi/my-blocked.txt"], |
| 735 | unsupported_packages: ["hiddenapi/my-unsupported-packages.txt"], |
Paul Duffin | 2fef136 | 2021-04-15 13:32:00 +0100 | [diff] [blame] | 736 | annotation_flags: "hiddenapi/annotation-flags.csv", |
| 737 | metadata: "hiddenapi/metadata.csv", |
| 738 | index: "hiddenapi/index.csv", |
Paul Duffin | 8d007e9 | 2021-07-22 12:00:49 +0100 | [diff] [blame] | 739 | signature_patterns: "hiddenapi/signature-patterns.csv", |
Paul Duffin | 191be3a | 2021-08-10 16:14:16 +0100 | [diff] [blame] | 740 | filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv", |
| 741 | filtered_flags: "hiddenapi/filtered-flags.csv", |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 742 | }, |
| 743 | } |
| 744 | |
| 745 | java_import { |
| 746 | name: "mybootlib", |
| 747 | prefer: false, |
| 748 | visibility: ["//visibility:public"], |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 749 | apex_available: ["myapex"], |
Paul Duffin | 5c21145 | 2021-07-15 12:42:44 +0100 | [diff] [blame] | 750 | jars: ["java_boot_libs/snapshot/jars/are/invalid/mybootlib.jar"], |
Paul Duffin | 869de14 | 2021-07-15 14:14:41 +0100 | [diff] [blame] | 751 | permitted_packages: ["mybootlib"], |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 752 | } |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 753 | |
| 754 | java_sdk_library_import { |
| 755 | name: "mysdklibrary", |
| 756 | prefer: false, |
| 757 | visibility: ["//visibility:public"], |
| 758 | apex_available: ["//apex_available:platform"], |
| 759 | shared_library: true, |
| 760 | compile_dex: true, |
Paul Duffin | 869de14 | 2021-07-15 14:14:41 +0100 | [diff] [blame] | 761 | permitted_packages: ["mysdklibrary"], |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 762 | public: { |
| 763 | jars: ["sdk_library/public/mysdklibrary-stubs.jar"], |
| 764 | stub_srcs: ["sdk_library/public/mysdklibrary_stub_sources"], |
| 765 | current_api: "sdk_library/public/mysdklibrary.txt", |
| 766 | removed_api: "sdk_library/public/mysdklibrary-removed.txt", |
| 767 | sdk_version: "current", |
| 768 | }, |
| 769 | } |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 770 | `), |
| 771 | checkAllCopyRules(` |
| 772 | my-unsupported.txt -> hiddenapi/my-unsupported.txt |
| 773 | my-removed.txt -> hiddenapi/my-removed.txt |
| 774 | my-max-target-r-low-priority.txt -> hiddenapi/my-max-target-r-low-priority.txt |
| 775 | my-max-target-q.txt -> hiddenapi/my-max-target-q.txt |
| 776 | my-max-target-p.txt -> hiddenapi/my-max-target-p.txt |
| 777 | my-max-target-o-low-priority.txt -> hiddenapi/my-max-target-o-low-priority.txt |
| 778 | my-blocked.txt -> hiddenapi/my-blocked.txt |
| 779 | my-unsupported-packages.txt -> hiddenapi/my-unsupported-packages.txt |
Paul Duffin | 2fef136 | 2021-04-15 13:32:00 +0100 | [diff] [blame] | 780 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/annotation-flags.csv -> hiddenapi/annotation-flags.csv |
| 781 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/metadata.csv -> hiddenapi/metadata.csv |
| 782 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/index.csv -> hiddenapi/index.csv |
Paul Duffin | 8d007e9 | 2021-07-22 12:00:49 +0100 | [diff] [blame] | 783 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/signature-patterns.csv -> hiddenapi/signature-patterns.csv |
Paul Duffin | 280bae6 | 2021-07-20 18:03:53 +0100 | [diff] [blame] | 784 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/filtered-stub-flags.csv -> hiddenapi/filtered-stub-flags.csv |
| 785 | .intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/filtered-flags.csv -> hiddenapi/filtered-flags.csv |
Paul Duffin | 5c21145 | 2021-07-15 12:42:44 +0100 | [diff] [blame] | 786 | .intermediates/mysdk/common_os/empty -> java_boot_libs/snapshot/jars/are/invalid/mybootlib.jar |
Paul Duffin | 475daaf | 2021-05-13 00:57:55 +0100 | [diff] [blame] | 787 | .intermediates/mysdklibrary.stubs/android_common/javac/mysdklibrary.stubs.jar -> sdk_library/public/mysdklibrary-stubs.jar |
| 788 | .intermediates/mysdklibrary.stubs.source/android_common/metalava/mysdklibrary.stubs.source_api.txt -> sdk_library/public/mysdklibrary.txt |
| 789 | .intermediates/mysdklibrary.stubs.source/android_common/metalava/mysdklibrary.stubs.source_removed.txt -> sdk_library/public/mysdklibrary-removed.txt |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 790 | `), |
Paul Duffin | 7c47515 | 2021-06-09 16:17:58 +0100 | [diff] [blame] | 791 | snapshotTestPreparer(checkSnapshotWithoutSource, preparerForSnapshot), |
| 792 | snapshotTestPreparer(checkSnapshotWithSourcePreferred, preparerForSnapshot), |
| 793 | snapshotTestPreparer(checkSnapshotPreferredWithSource, preparerForSnapshot), |
Paul Duffin | 7c95555 | 2021-04-19 13:23:53 +0100 | [diff] [blame] | 794 | ) |
| 795 | } |