Paul Duffin | a80fdec | 2019-12-03 15:25:00 +0000 | [diff] [blame] | 1 | // Copyright (C) 2019 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 | |
| 17 | import ( |
Paul Duffin | 1364891 | 2022-07-15 13:12:35 +0000 | [diff] [blame] | 18 | "fmt" |
Paul Duffin | a80fdec | 2019-12-03 15:25:00 +0000 | [diff] [blame] | 19 | "testing" |
Paul Duffin | cee7e66 | 2020-07-09 17:32:57 +0100 | [diff] [blame] | 20 | |
Paul Duffin | 4a2a29c | 2021-03-09 22:27:13 +0000 | [diff] [blame] | 21 | "android/soong/android" |
Paul Duffin | cee7e66 | 2020-07-09 17:32:57 +0100 | [diff] [blame] | 22 | "android/soong/java" |
Paul Duffin | a80fdec | 2019-12-03 15:25:00 +0000 | [diff] [blame] | 23 | ) |
| 24 | |
Paul Duffin | d14cbc1 | 2021-03-18 09:14:23 +0000 | [diff] [blame] | 25 | var prepareForSdkTestWithJava = android.GroupFixturePreparers( |
| 26 | java.PrepareForTestWithJavaBuildComponents, |
| 27 | PrepareForTestWithSdkBuildComponents, |
Paul Duffin | db462dd | 2021-03-21 22:01:55 +0000 | [diff] [blame] | 28 | |
| 29 | // Ensure that all source paths are provided. This helps ensure that the snapshot generation is |
| 30 | // consistent and all files referenced from the snapshot's Android.bp file have actually been |
| 31 | // copied into the snapshot. |
| 32 | android.PrepareForTestDisallowNonExistentPaths, |
| 33 | |
| 34 | // Files needs by most of the tests. |
| 35 | android.MockFS{ |
Jiakai Zhang | 9c4dc19 | 2023-02-09 00:09:24 +0800 | [diff] [blame] | 36 | "Test.java": nil, |
| 37 | "art-profile": nil, |
Paul Duffin | db462dd | 2021-03-21 22:01:55 +0000 | [diff] [blame] | 38 | }.AddToFixture(), |
Paul Duffin | d14cbc1 | 2021-03-18 09:14:23 +0000 | [diff] [blame] | 39 | ) |
| 40 | |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 41 | var prepareForSdkTestWithJavaSdkLibrary = android.GroupFixturePreparers( |
| 42 | prepareForSdkTestWithJava, |
| 43 | java.PrepareForTestWithJavaDefaultModules, |
| 44 | java.PrepareForTestWithJavaSdkLibraryFiles, |
| 45 | java.FixtureWithLastReleaseApis("myjavalib"), |
| 46 | ) |
| 47 | |
Paul Duffin | a80fdec | 2019-12-03 15:25:00 +0000 | [diff] [blame] | 48 | // Contains tests for SDK members provided by the java package. |
| 49 | |
Paul Duffin | cee7e66 | 2020-07-09 17:32:57 +0100 | [diff] [blame] | 50 | func TestSdkDependsOnSourceEvenWhenPrebuiltPreferred(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 51 | result := android.GroupFixturePreparers(prepareForSdkTestWithJava).RunTestWithBp(t, ` |
Paul Duffin | cee7e66 | 2020-07-09 17:32:57 +0100 | [diff] [blame] | 52 | sdk { |
| 53 | name: "mysdk", |
| 54 | java_header_libs: ["sdkmember"], |
| 55 | } |
| 56 | |
| 57 | java_library { |
| 58 | name: "sdkmember", |
| 59 | srcs: ["Test.java"], |
| 60 | system_modules: "none", |
| 61 | sdk_version: "none", |
| 62 | } |
Paul Duffin | cee7e66 | 2020-07-09 17:32:57 +0100 | [diff] [blame] | 63 | `) |
| 64 | |
| 65 | // Make sure that the mysdk module depends on "sdkmember" and not "prebuilt_sdkmember". |
Paul Duffin | 1822a0a | 2021-03-21 12:56:33 +0000 | [diff] [blame] | 66 | sdkChecker := func(t *testing.T, result *android.TestResult) { |
| 67 | java.CheckModuleDependencies(t, result.TestContext, "mysdk", "android_common", []string{"sdkmember"}) |
| 68 | } |
Paul Duffin | cee7e66 | 2020-07-09 17:32:57 +0100 | [diff] [blame] | 69 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 70 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | 1822a0a | 2021-03-21 12:56:33 +0000 | [diff] [blame] | 71 | snapshotTestChecker(checkSnapshotWithSourcePreferred, sdkChecker), |
| 72 | snapshotTestChecker(checkSnapshotPreferredWithSource, sdkChecker), |
| 73 | ) |
Paul Duffin | cee7e66 | 2020-07-09 17:32:57 +0100 | [diff] [blame] | 74 | } |
| 75 | |
Paul Duffin | a0dbf43 | 2019-12-05 11:25:53 +0000 | [diff] [blame] | 76 | func TestSnapshotWithJavaHeaderLibrary(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 77 | result := android.GroupFixturePreparers( |
| 78 | prepareForSdkTestWithJava, |
| 79 | android.FixtureAddFile("aidl/foo/bar/Test.aidl", nil), |
| 80 | ).RunTestWithBp(t, ` |
Paul Duffin | a0dbf43 | 2019-12-05 11:25:53 +0000 | [diff] [blame] | 81 | sdk { |
| 82 | name: "mysdk", |
| 83 | java_header_libs: ["myjavalib"], |
| 84 | } |
| 85 | |
| 86 | java_library { |
| 87 | name: "myjavalib", |
| 88 | srcs: ["Test.java"], |
| 89 | aidl: { |
| 90 | export_include_dirs: ["aidl"], |
| 91 | }, |
| 92 | system_modules: "none", |
| 93 | sdk_version: "none", |
| 94 | compile_dex: true, |
| 95 | host_supported: true, |
Paul Duffin | 869de14 | 2021-07-15 14:14:41 +0100 | [diff] [blame] | 96 | permitted_packages: ["pkg.myjavalib"], |
Paul Duffin | a0dbf43 | 2019-12-05 11:25:53 +0000 | [diff] [blame] | 97 | } |
| 98 | `) |
| 99 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 100 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 101 | checkAndroidBpContents(` |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 102 | // This is auto-generated. DO NOT EDIT. |
| 103 | |
| 104 | java_import { |
| 105 | name: "myjavalib", |
| 106 | prefer: false, |
| 107 | visibility: ["//visibility:public"], |
| 108 | apex_available: ["//apex_available:platform"], |
| 109 | jars: ["java/myjavalib.jar"], |
Paul Duffin | 869de14 | 2021-07-15 14:14:41 +0100 | [diff] [blame] | 110 | permitted_packages: ["pkg.myjavalib"], |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 111 | } |
| 112 | `), |
Paul Duffin | a0dbf43 | 2019-12-05 11:25:53 +0000 | [diff] [blame] | 113 | checkAllCopyRules(` |
| 114 | .intermediates/myjavalib/android_common/turbine-combined/myjavalib.jar -> java/myjavalib.jar |
| 115 | aidl/foo/bar/Test.aidl -> aidl/aidl/foo/bar/Test.aidl |
| 116 | `), |
| 117 | ) |
| 118 | } |
| 119 | |
| 120 | func TestHostSnapshotWithJavaHeaderLibrary(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 121 | result := android.GroupFixturePreparers( |
| 122 | prepareForSdkTestWithJava, |
| 123 | android.FixtureAddFile("aidl/foo/bar/Test.aidl", nil), |
| 124 | ).RunTestWithBp(t, ` |
Paul Duffin | a0dbf43 | 2019-12-05 11:25:53 +0000 | [diff] [blame] | 125 | sdk { |
| 126 | name: "mysdk", |
| 127 | device_supported: false, |
| 128 | host_supported: true, |
| 129 | java_header_libs: ["myjavalib"], |
| 130 | } |
| 131 | |
| 132 | java_library { |
| 133 | name: "myjavalib", |
| 134 | device_supported: false, |
| 135 | host_supported: true, |
| 136 | srcs: ["Test.java"], |
| 137 | aidl: { |
| 138 | export_include_dirs: ["aidl"], |
| 139 | }, |
| 140 | system_modules: "none", |
| 141 | sdk_version: "none", |
| 142 | compile_dex: true, |
| 143 | } |
| 144 | `) |
| 145 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 146 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 147 | checkAndroidBpContents(` |
Paul Duffin | a0dbf43 | 2019-12-05 11:25:53 +0000 | [diff] [blame] | 148 | // This is auto-generated. DO NOT EDIT. |
| 149 | |
| 150 | java_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 151 | name: "myjavalib", |
| 152 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 153 | visibility: ["//visibility:public"], |
Martin Stjernholm | 1e04109 | 2020-11-03 00:11:09 +0000 | [diff] [blame] | 154 | apex_available: ["//apex_available:platform"], |
Paul Duffin | a0dbf43 | 2019-12-05 11:25:53 +0000 | [diff] [blame] | 155 | device_supported: false, |
| 156 | host_supported: true, |
| 157 | jars: ["java/myjavalib.jar"], |
| 158 | } |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 159 | `), |
Paul Duffin | a0dbf43 | 2019-12-05 11:25:53 +0000 | [diff] [blame] | 160 | checkAllCopyRules(` |
| 161 | .intermediates/myjavalib/linux_glibc_common/javac/myjavalib.jar -> java/myjavalib.jar |
| 162 | aidl/foo/bar/Test.aidl -> aidl/aidl/foo/bar/Test.aidl |
| 163 | `), |
| 164 | ) |
| 165 | } |
| 166 | |
Paul Duffin | a04c107 | 2020-03-02 10:16:35 +0000 | [diff] [blame] | 167 | func TestDeviceAndHostSnapshotWithJavaHeaderLibrary(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 168 | result := android.GroupFixturePreparers(prepareForSdkTestWithJava).RunTestWithBp(t, ` |
Paul Duffin | a04c107 | 2020-03-02 10:16:35 +0000 | [diff] [blame] | 169 | sdk { |
| 170 | name: "mysdk", |
| 171 | host_supported: true, |
| 172 | java_header_libs: ["myjavalib"], |
| 173 | } |
| 174 | |
| 175 | java_library { |
| 176 | name: "myjavalib", |
| 177 | host_supported: true, |
| 178 | srcs: ["Test.java"], |
| 179 | system_modules: "none", |
| 180 | sdk_version: "none", |
| 181 | compile_dex: true, |
| 182 | } |
| 183 | `) |
| 184 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 185 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 186 | checkAndroidBpContents(` |
Paul Duffin | a04c107 | 2020-03-02 10:16:35 +0000 | [diff] [blame] | 187 | // This is auto-generated. DO NOT EDIT. |
| 188 | |
| 189 | java_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 190 | name: "myjavalib", |
| 191 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 192 | visibility: ["//visibility:public"], |
Martin Stjernholm | 1e04109 | 2020-11-03 00:11:09 +0000 | [diff] [blame] | 193 | apex_available: ["//apex_available:platform"], |
Paul Duffin | a04c107 | 2020-03-02 10:16:35 +0000 | [diff] [blame] | 194 | host_supported: true, |
| 195 | target: { |
| 196 | android: { |
| 197 | jars: ["java/android/myjavalib.jar"], |
| 198 | }, |
| 199 | linux_glibc: { |
| 200 | jars: ["java/linux_glibc/myjavalib.jar"], |
| 201 | }, |
| 202 | }, |
| 203 | } |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 204 | `), |
Paul Duffin | a04c107 | 2020-03-02 10:16:35 +0000 | [diff] [blame] | 205 | checkAllCopyRules(` |
| 206 | .intermediates/myjavalib/android_common/turbine-combined/myjavalib.jar -> java/android/myjavalib.jar |
| 207 | .intermediates/myjavalib/linux_glibc_common/javac/myjavalib.jar -> java/linux_glibc/myjavalib.jar |
| 208 | `), |
| 209 | ) |
| 210 | } |
| 211 | |
Paul Duffin | a0dbf43 | 2019-12-05 11:25:53 +0000 | [diff] [blame] | 212 | func TestSnapshotWithJavaImplLibrary(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 213 | result := android.GroupFixturePreparers( |
| 214 | prepareForSdkTestWithJava, |
| 215 | android.FixtureAddFile("aidl/foo/bar/Test.aidl", nil), |
Paul Duffin | db462dd | 2021-03-21 22:01:55 +0000 | [diff] [blame] | 216 | android.FixtureAddFile("resource.txt", nil), |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 217 | ).RunTestWithBp(t, ` |
Paul Duffin | e602918 | 2019-12-16 17:43:48 +0000 | [diff] [blame] | 218 | module_exports { |
| 219 | name: "myexports", |
Paul Duffin | a80fdec | 2019-12-03 15:25:00 +0000 | [diff] [blame] | 220 | java_libs: ["myjavalib"], |
| 221 | } |
| 222 | |
| 223 | java_library { |
| 224 | name: "myjavalib", |
| 225 | srcs: ["Test.java"], |
Paul Duffin | 4e77284 | 2020-06-24 12:10:42 +0100 | [diff] [blame] | 226 | java_resources: ["resource.txt"], |
Paul Duffin | a80fdec | 2019-12-03 15:25:00 +0000 | [diff] [blame] | 227 | aidl: { |
| 228 | export_include_dirs: ["aidl"], |
| 229 | }, |
| 230 | system_modules: "none", |
| 231 | sdk_version: "none", |
| 232 | compile_dex: true, |
| 233 | host_supported: true, |
| 234 | } |
| 235 | `) |
| 236 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 237 | CheckSnapshot(t, result, "myexports", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 238 | checkAndroidBpContents(` |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 239 | // This is auto-generated. DO NOT EDIT. |
| 240 | |
| 241 | java_import { |
| 242 | name: "myjavalib", |
| 243 | prefer: false, |
| 244 | visibility: ["//visibility:public"], |
| 245 | apex_available: ["//apex_available:platform"], |
| 246 | jars: ["java/myjavalib.jar"], |
| 247 | } |
| 248 | `), |
Paul Duffin | a80fdec | 2019-12-03 15:25:00 +0000 | [diff] [blame] | 249 | checkAllCopyRules(` |
Paul Duffin | 4e77284 | 2020-06-24 12:10:42 +0100 | [diff] [blame] | 250 | .intermediates/myjavalib/android_common/withres/myjavalib.jar -> java/myjavalib.jar |
Paul Duffin | a80fdec | 2019-12-03 15:25:00 +0000 | [diff] [blame] | 251 | aidl/foo/bar/Test.aidl -> aidl/aidl/foo/bar/Test.aidl |
| 252 | `), |
| 253 | ) |
| 254 | } |
| 255 | |
Paul Duffin | db170e4 | 2020-12-08 17:48:25 +0000 | [diff] [blame] | 256 | func TestSnapshotWithJavaBootLibrary(t *testing.T) { |
Paul Duffin | db462dd | 2021-03-21 22:01:55 +0000 | [diff] [blame] | 257 | result := android.GroupFixturePreparers( |
| 258 | prepareForSdkTestWithJava, |
| 259 | android.FixtureAddFile("aidl", nil), |
| 260 | android.FixtureAddFile("resource.txt", nil), |
| 261 | ).RunTestWithBp(t, ` |
Paul Duffin | 1364891 | 2022-07-15 13:12:35 +0000 | [diff] [blame] | 262 | sdk { |
| 263 | name: "mysdk", |
Paul Duffin | db170e4 | 2020-12-08 17:48:25 +0000 | [diff] [blame] | 264 | java_boot_libs: ["myjavalib"], |
| 265 | } |
| 266 | |
| 267 | java_library { |
| 268 | name: "myjavalib", |
| 269 | srcs: ["Test.java"], |
| 270 | java_resources: ["resource.txt"], |
| 271 | // The aidl files should not be copied to the snapshot because a java_boot_libs member is not |
| 272 | // intended to be used for compiling Java, only for accessing the dex implementation jar. |
| 273 | aidl: { |
| 274 | export_include_dirs: ["aidl"], |
| 275 | }, |
| 276 | system_modules: "none", |
| 277 | sdk_version: "none", |
| 278 | compile_dex: true, |
Paul Duffin | 869de14 | 2021-07-15 14:14:41 +0100 | [diff] [blame] | 279 | permitted_packages: ["pkg.myjavalib"], |
Paul Duffin | db170e4 | 2020-12-08 17:48:25 +0000 | [diff] [blame] | 280 | } |
| 281 | `) |
| 282 | |
Paul Duffin | 1364891 | 2022-07-15 13:12:35 +0000 | [diff] [blame] | 283 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 284 | checkAndroidBpContents(` |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 285 | // This is auto-generated. DO NOT EDIT. |
| 286 | |
| 287 | java_import { |
| 288 | name: "myjavalib", |
| 289 | prefer: false, |
| 290 | visibility: ["//visibility:public"], |
| 291 | apex_available: ["//apex_available:platform"], |
Paul Duffin | 7ed6ff8 | 2022-11-21 10:57:30 +0000 | [diff] [blame] | 292 | jars: ["java_boot_libs/snapshot/jars/are/invalid/myjavalib.jar"], |
Paul Duffin | 869de14 | 2021-07-15 14:14:41 +0100 | [diff] [blame] | 293 | permitted_packages: ["pkg.myjavalib"], |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 294 | } |
| 295 | `), |
Paul Duffin | db170e4 | 2020-12-08 17:48:25 +0000 | [diff] [blame] | 296 | checkAllCopyRules(` |
Paul Duffin | 7ed6ff8 | 2022-11-21 10:57:30 +0000 | [diff] [blame] | 297 | .intermediates/mysdk/common_os/empty -> java_boot_libs/snapshot/jars/are/invalid/myjavalib.jar |
Paul Duffin | db170e4 | 2020-12-08 17:48:25 +0000 | [diff] [blame] | 298 | `), |
| 299 | ) |
| 300 | } |
| 301 | |
Paul Duffin | 1364891 | 2022-07-15 13:12:35 +0000 | [diff] [blame] | 302 | func TestSnapshotWithJavaBootLibrary_UpdatableMedia(t *testing.T) { |
Paul Duffin | 7ed6ff8 | 2022-11-21 10:57:30 +0000 | [diff] [blame] | 303 | runTest := func(t *testing.T, targetBuildRelease, expectedJarPath, expectedCopyRule string) { |
Paul Duffin | 1364891 | 2022-07-15 13:12:35 +0000 | [diff] [blame] | 304 | result := android.GroupFixturePreparers( |
| 305 | prepareForSdkTestWithJava, |
| 306 | android.FixtureMergeEnv(map[string]string{ |
| 307 | "SOONG_SDK_SNAPSHOT_TARGET_BUILD_RELEASE": targetBuildRelease, |
| 308 | }), |
| 309 | ).RunTestWithBp(t, ` |
| 310 | sdk { |
| 311 | name: "mysdk", |
| 312 | java_boot_libs: ["updatable-media"], |
| 313 | } |
| 314 | |
| 315 | java_library { |
| 316 | name: "updatable-media", |
| 317 | srcs: ["Test.java"], |
| 318 | system_modules: "none", |
| 319 | sdk_version: "none", |
| 320 | compile_dex: true, |
| 321 | permitted_packages: ["pkg.media"], |
| 322 | apex_available: ["com.android.media"], |
| 323 | } |
| 324 | `) |
| 325 | |
| 326 | CheckSnapshot(t, result, "mysdk", "", |
| 327 | checkAndroidBpContents(fmt.Sprintf(` |
| 328 | // This is auto-generated. DO NOT EDIT. |
| 329 | |
| 330 | java_import { |
| 331 | name: "updatable-media", |
| 332 | prefer: false, |
| 333 | visibility: ["//visibility:public"], |
| 334 | apex_available: ["com.android.media"], |
| 335 | jars: ["%s"], |
| 336 | permitted_packages: ["pkg.media"], |
| 337 | } |
Paul Duffin | 7ed6ff8 | 2022-11-21 10:57:30 +0000 | [diff] [blame] | 338 | `, expectedJarPath)), |
Paul Duffin | 1364891 | 2022-07-15 13:12:35 +0000 | [diff] [blame] | 339 | checkAllCopyRules(expectedCopyRule), |
| 340 | ) |
| 341 | } |
| 342 | |
| 343 | t.Run("updatable-media in S", func(t *testing.T) { |
Paul Duffin | 7ed6ff8 | 2022-11-21 10:57:30 +0000 | [diff] [blame] | 344 | runTest(t, "S", "java/updatable-media.jar", ` |
Paul Duffin | 1364891 | 2022-07-15 13:12:35 +0000 | [diff] [blame] | 345 | .intermediates/updatable-media/android_common/package-check/updatable-media.jar -> java/updatable-media.jar |
| 346 | `) |
| 347 | }) |
| 348 | |
| 349 | t.Run("updatable-media in T", func(t *testing.T) { |
Paul Duffin | 7ed6ff8 | 2022-11-21 10:57:30 +0000 | [diff] [blame] | 350 | runTest(t, "Tiramisu", "java_boot_libs/snapshot/jars/are/invalid/updatable-media.jar", ` |
| 351 | .intermediates/mysdk/common_os/empty -> java_boot_libs/snapshot/jars/are/invalid/updatable-media.jar |
Paul Duffin | 1364891 | 2022-07-15 13:12:35 +0000 | [diff] [blame] | 352 | `) |
| 353 | }) |
| 354 | } |
| 355 | |
Paul Duffin | bb638eb | 2022-11-26 13:36:38 +0000 | [diff] [blame] | 356 | func TestSnapshotWithJavaLibrary_MinSdkVersion(t *testing.T) { |
| 357 | runTest := func(t *testing.T, targetBuildRelease, minSdkVersion, expectedMinSdkVersion string) { |
| 358 | result := android.GroupFixturePreparers( |
| 359 | prepareForSdkTestWithJava, |
| 360 | android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { |
| 361 | variables.Platform_version_active_codenames = []string{"S", "Tiramisu", "Unfinalized"} |
| 362 | }), |
| 363 | android.FixtureMergeEnv(map[string]string{ |
| 364 | "SOONG_SDK_SNAPSHOT_TARGET_BUILD_RELEASE": targetBuildRelease, |
| 365 | }), |
| 366 | ).RunTestWithBp(t, fmt.Sprintf(` |
| 367 | sdk { |
| 368 | name: "mysdk", |
| 369 | java_header_libs: ["mylib"], |
| 370 | } |
| 371 | |
| 372 | java_library { |
| 373 | name: "mylib", |
| 374 | srcs: ["Test.java"], |
| 375 | system_modules: "none", |
| 376 | sdk_version: "none", |
| 377 | compile_dex: true, |
| 378 | min_sdk_version: "%s", |
| 379 | } |
| 380 | `, minSdkVersion)) |
| 381 | |
| 382 | expectedMinSdkVersionLine := "" |
| 383 | if expectedMinSdkVersion != "" { |
| 384 | expectedMinSdkVersionLine = fmt.Sprintf(" min_sdk_version: %q,\n", expectedMinSdkVersion) |
| 385 | } |
| 386 | |
| 387 | CheckSnapshot(t, result, "mysdk", "", |
| 388 | checkAndroidBpContents(fmt.Sprintf(` |
| 389 | // This is auto-generated. DO NOT EDIT. |
| 390 | |
| 391 | java_import { |
| 392 | name: "mylib", |
| 393 | prefer: false, |
| 394 | visibility: ["//visibility:public"], |
| 395 | apex_available: ["//apex_available:platform"], |
| 396 | jars: ["java/mylib.jar"], |
| 397 | %s} |
| 398 | `, expectedMinSdkVersionLine)), |
| 399 | ) |
| 400 | } |
| 401 | |
| 402 | t.Run("min_sdk_version=S in S", func(t *testing.T) { |
| 403 | // min_sdk_version was not added to java_import until Tiramisu. |
| 404 | runTest(t, "S", "S", "") |
| 405 | }) |
| 406 | |
| 407 | t.Run("min_sdk_version=S in Tiramisu", func(t *testing.T) { |
| 408 | // The canonical form of S is 31. |
| 409 | runTest(t, "Tiramisu", "S", "31") |
| 410 | }) |
| 411 | |
| 412 | t.Run("min_sdk_version=24 in Tiramisu", func(t *testing.T) { |
| 413 | // A numerical min_sdk_version is already in canonical form. |
| 414 | runTest(t, "Tiramisu", "24", "24") |
| 415 | }) |
| 416 | |
| 417 | t.Run("min_sdk_version=Unfinalized in latest", func(t *testing.T) { |
| 418 | // An unfinalized min_sdk_version has no numeric value yet. |
| 419 | runTest(t, "", "Unfinalized", "Unfinalized") |
| 420 | }) |
| 421 | } |
| 422 | |
Jiakai Zhang | ea18033 | 2021-09-26 08:58:02 +0000 | [diff] [blame] | 423 | func TestSnapshotWithJavaSystemserverLibrary(t *testing.T) { |
| 424 | result := android.GroupFixturePreparers( |
| 425 | prepareForSdkTestWithJava, |
| 426 | android.FixtureAddFile("aidl", nil), |
| 427 | android.FixtureAddFile("resource.txt", nil), |
| 428 | ).RunTestWithBp(t, ` |
| 429 | module_exports { |
| 430 | name: "myexports", |
| 431 | java_systemserver_libs: ["myjavalib"], |
| 432 | } |
| 433 | |
| 434 | java_library { |
| 435 | name: "myjavalib", |
| 436 | srcs: ["Test.java"], |
| 437 | java_resources: ["resource.txt"], |
| 438 | // The aidl files should not be copied to the snapshot because a java_systemserver_libs member |
| 439 | // is not intended to be used for compiling Java, only for accessing the dex implementation |
| 440 | // jar. |
| 441 | aidl: { |
| 442 | export_include_dirs: ["aidl"], |
| 443 | }, |
| 444 | system_modules: "none", |
| 445 | sdk_version: "none", |
| 446 | compile_dex: true, |
| 447 | permitted_packages: ["pkg.myjavalib"], |
| 448 | } |
| 449 | `) |
| 450 | |
| 451 | CheckSnapshot(t, result, "myexports", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 452 | checkAndroidBpContents(` |
Jiakai Zhang | ea18033 | 2021-09-26 08:58:02 +0000 | [diff] [blame] | 453 | // This is auto-generated. DO NOT EDIT. |
| 454 | |
| 455 | java_import { |
| 456 | name: "myjavalib", |
| 457 | prefer: false, |
| 458 | visibility: ["//visibility:public"], |
| 459 | apex_available: ["//apex_available:platform"], |
Paul Duffin | 7ed6ff8 | 2022-11-21 10:57:30 +0000 | [diff] [blame] | 460 | jars: ["java_systemserver_libs/snapshot/jars/are/invalid/myjavalib.jar"], |
Jiakai Zhang | ea18033 | 2021-09-26 08:58:02 +0000 | [diff] [blame] | 461 | permitted_packages: ["pkg.myjavalib"], |
| 462 | } |
| 463 | `), |
Jiakai Zhang | ea18033 | 2021-09-26 08:58:02 +0000 | [diff] [blame] | 464 | checkAllCopyRules(` |
Paul Duffin | 7ed6ff8 | 2022-11-21 10:57:30 +0000 | [diff] [blame] | 465 | .intermediates/myexports/common_os/empty -> java_systemserver_libs/snapshot/jars/are/invalid/myjavalib.jar |
Jiakai Zhang | ea18033 | 2021-09-26 08:58:02 +0000 | [diff] [blame] | 466 | `), |
| 467 | ) |
| 468 | } |
| 469 | |
Paul Duffin | a0dbf43 | 2019-12-05 11:25:53 +0000 | [diff] [blame] | 470 | func TestHostSnapshotWithJavaImplLibrary(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 471 | result := android.GroupFixturePreparers( |
| 472 | prepareForSdkTestWithJava, |
| 473 | android.FixtureAddFile("aidl/foo/bar/Test.aidl", nil), |
| 474 | ).RunTestWithBp(t, ` |
Paul Duffin | e602918 | 2019-12-16 17:43:48 +0000 | [diff] [blame] | 475 | module_exports { |
| 476 | name: "myexports", |
Paul Duffin | a80fdec | 2019-12-03 15:25:00 +0000 | [diff] [blame] | 477 | device_supported: false, |
| 478 | host_supported: true, |
| 479 | java_libs: ["myjavalib"], |
| 480 | } |
| 481 | |
| 482 | java_library { |
| 483 | name: "myjavalib", |
| 484 | device_supported: false, |
| 485 | host_supported: true, |
| 486 | srcs: ["Test.java"], |
| 487 | aidl: { |
| 488 | export_include_dirs: ["aidl"], |
| 489 | }, |
| 490 | system_modules: "none", |
| 491 | sdk_version: "none", |
| 492 | compile_dex: true, |
| 493 | } |
| 494 | `) |
| 495 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 496 | CheckSnapshot(t, result, "myexports", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 497 | checkAndroidBpContents(` |
Paul Duffin | a80fdec | 2019-12-03 15:25:00 +0000 | [diff] [blame] | 498 | // This is auto-generated. DO NOT EDIT. |
| 499 | |
| 500 | java_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 501 | name: "myjavalib", |
| 502 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 503 | visibility: ["//visibility:public"], |
Martin Stjernholm | 1e04109 | 2020-11-03 00:11:09 +0000 | [diff] [blame] | 504 | apex_available: ["//apex_available:platform"], |
Paul Duffin | a80fdec | 2019-12-03 15:25:00 +0000 | [diff] [blame] | 505 | device_supported: false, |
| 506 | host_supported: true, |
| 507 | jars: ["java/myjavalib.jar"], |
| 508 | } |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 509 | `), |
Paul Duffin | a80fdec | 2019-12-03 15:25:00 +0000 | [diff] [blame] | 510 | checkAllCopyRules(` |
| 511 | .intermediates/myjavalib/linux_glibc_common/javac/myjavalib.jar -> java/myjavalib.jar |
| 512 | aidl/foo/bar/Test.aidl -> aidl/aidl/foo/bar/Test.aidl |
| 513 | `), |
| 514 | ) |
| 515 | } |
| 516 | |
Paul Duffin | 1b82e6a | 2019-12-03 18:06:47 +0000 | [diff] [blame] | 517 | func TestSnapshotWithJavaTest(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 518 | result := android.GroupFixturePreparers(prepareForSdkTestWithJava).RunTestWithBp(t, ` |
Paul Duffin | 1b82e6a | 2019-12-03 18:06:47 +0000 | [diff] [blame] | 519 | module_exports { |
| 520 | name: "myexports", |
| 521 | java_tests: ["myjavatests"], |
| 522 | } |
| 523 | |
| 524 | java_test { |
| 525 | name: "myjavatests", |
| 526 | srcs: ["Test.java"], |
| 527 | system_modules: "none", |
| 528 | sdk_version: "none", |
| 529 | compile_dex: true, |
| 530 | host_supported: true, |
| 531 | } |
| 532 | `) |
| 533 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 534 | CheckSnapshot(t, result, "myexports", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 535 | checkAndroidBpContents(` |
Paul Duffin | 1b82e6a | 2019-12-03 18:06:47 +0000 | [diff] [blame] | 536 | // This is auto-generated. DO NOT EDIT. |
| 537 | |
| 538 | java_test_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 539 | name: "myjavatests", |
| 540 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 541 | visibility: ["//visibility:public"], |
Martin Stjernholm | 1e04109 | 2020-11-03 00:11:09 +0000 | [diff] [blame] | 542 | apex_available: ["//apex_available:platform"], |
Paul Duffin | 1b82e6a | 2019-12-03 18:06:47 +0000 | [diff] [blame] | 543 | jars: ["java/myjavatests.jar"], |
| 544 | test_config: "java/myjavatests-AndroidTest.xml", |
| 545 | } |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 546 | `), |
Paul Duffin | 1b82e6a | 2019-12-03 18:06:47 +0000 | [diff] [blame] | 547 | checkAllCopyRules(` |
| 548 | .intermediates/myjavatests/android_common/javac/myjavatests.jar -> java/myjavatests.jar |
| 549 | .intermediates/myjavatests/android_common/myjavatests.config -> java/myjavatests-AndroidTest.xml |
| 550 | `), |
| 551 | ) |
| 552 | } |
| 553 | |
| 554 | func TestHostSnapshotWithJavaTest(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 555 | result := android.GroupFixturePreparers(prepareForSdkTestWithJava).RunTestWithBp(t, ` |
Paul Duffin | 1b82e6a | 2019-12-03 18:06:47 +0000 | [diff] [blame] | 556 | module_exports { |
| 557 | name: "myexports", |
| 558 | device_supported: false, |
| 559 | host_supported: true, |
| 560 | java_tests: ["myjavatests"], |
| 561 | } |
| 562 | |
| 563 | java_test { |
| 564 | name: "myjavatests", |
| 565 | device_supported: false, |
| 566 | host_supported: true, |
| 567 | srcs: ["Test.java"], |
| 568 | system_modules: "none", |
| 569 | sdk_version: "none", |
| 570 | compile_dex: true, |
| 571 | } |
| 572 | `) |
| 573 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 574 | CheckSnapshot(t, result, "myexports", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 575 | checkAndroidBpContents(` |
Paul Duffin | 1b82e6a | 2019-12-03 18:06:47 +0000 | [diff] [blame] | 576 | // This is auto-generated. DO NOT EDIT. |
| 577 | |
| 578 | java_test_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 579 | name: "myjavatests", |
| 580 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 581 | visibility: ["//visibility:public"], |
Martin Stjernholm | 1e04109 | 2020-11-03 00:11:09 +0000 | [diff] [blame] | 582 | apex_available: ["//apex_available:platform"], |
Paul Duffin | 1b82e6a | 2019-12-03 18:06:47 +0000 | [diff] [blame] | 583 | device_supported: false, |
| 584 | host_supported: true, |
| 585 | jars: ["java/myjavatests.jar"], |
| 586 | test_config: "java/myjavatests-AndroidTest.xml", |
| 587 | } |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 588 | `), |
Paul Duffin | 1b82e6a | 2019-12-03 18:06:47 +0000 | [diff] [blame] | 589 | checkAllCopyRules(` |
| 590 | .intermediates/myjavatests/linux_glibc_common/javac/myjavatests.jar -> java/myjavatests.jar |
| 591 | .intermediates/myjavatests/linux_glibc_common/myjavatests.config -> java/myjavatests-AndroidTest.xml |
| 592 | `), |
| 593 | ) |
| 594 | } |
| 595 | |
Paul Duffin | 7b81f5e | 2020-01-13 21:03:22 +0000 | [diff] [blame] | 596 | func TestSnapshotWithJavaSystemModules(t *testing.T) { |
Paul Duffin | 958806b | 2022-05-16 13:10:47 +0000 | [diff] [blame] | 597 | result := android.GroupFixturePreparers( |
| 598 | prepareForSdkTestWithJava, |
| 599 | java.PrepareForTestWithJavaDefaultModules, |
| 600 | java.PrepareForTestWithJavaSdkLibraryFiles, |
| 601 | java.FixtureWithPrebuiltApisAndExtensions(map[string][]string{ |
| 602 | "31": {"myjavalib"}, |
| 603 | "32": {"myjavalib"}, |
| 604 | "current": {"myjavalib"}, |
| 605 | }, map[string][]string{ |
| 606 | "1": {"myjavalib"}, |
| 607 | "2": {"myjavalib"}, |
| 608 | }), |
| 609 | ).RunTestWithBp(t, ` |
Paul Duffin | 7b81f5e | 2020-01-13 21:03:22 +0000 | [diff] [blame] | 610 | sdk { |
| 611 | name: "mysdk", |
Paul Duffin | 7291095 | 2020-01-20 18:16:30 +0000 | [diff] [blame] | 612 | java_header_libs: ["exported-system-module"], |
Paul Duffin | 3302871 | 2021-06-22 11:00:07 +0100 | [diff] [blame] | 613 | java_sdk_libs: ["myjavalib"], |
Paul Duffin | 7b81f5e | 2020-01-13 21:03:22 +0000 | [diff] [blame] | 614 | java_system_modules: ["my-system-modules"], |
| 615 | } |
| 616 | |
Paul Duffin | 3302871 | 2021-06-22 11:00:07 +0100 | [diff] [blame] | 617 | java_sdk_library { |
| 618 | name: "myjavalib", |
| 619 | apex_available: ["//apex_available:anyapex"], |
| 620 | srcs: ["Test.java"], |
| 621 | sdk_version: "current", |
| 622 | shared_library: false, |
| 623 | public: { |
| 624 | enabled: true, |
| 625 | }, |
| 626 | } |
| 627 | |
Paul Duffin | 7b81f5e | 2020-01-13 21:03:22 +0000 | [diff] [blame] | 628 | java_system_modules { |
| 629 | name: "my-system-modules", |
Paul Duffin | 3302871 | 2021-06-22 11:00:07 +0100 | [diff] [blame] | 630 | libs: ["system-module", "exported-system-module", "myjavalib.stubs"], |
Paul Duffin | 7b81f5e | 2020-01-13 21:03:22 +0000 | [diff] [blame] | 631 | } |
| 632 | |
| 633 | java_library { |
| 634 | name: "system-module", |
| 635 | srcs: ["Test.java"], |
| 636 | sdk_version: "none", |
| 637 | system_modules: "none", |
| 638 | } |
Paul Duffin | 7291095 | 2020-01-20 18:16:30 +0000 | [diff] [blame] | 639 | |
| 640 | java_library { |
| 641 | name: "exported-system-module", |
| 642 | srcs: ["Test.java"], |
| 643 | sdk_version: "none", |
| 644 | system_modules: "none", |
| 645 | } |
Paul Duffin | 7b81f5e | 2020-01-13 21:03:22 +0000 | [diff] [blame] | 646 | `) |
| 647 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 648 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 649 | checkAndroidBpContents(` |
Paul Duffin | 7b81f5e | 2020-01-13 21:03:22 +0000 | [diff] [blame] | 650 | // This is auto-generated. DO NOT EDIT. |
| 651 | |
| 652 | java_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 653 | name: "exported-system-module", |
| 654 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 655 | visibility: ["//visibility:public"], |
Martin Stjernholm | 1e04109 | 2020-11-03 00:11:09 +0000 | [diff] [blame] | 656 | apex_available: ["//apex_available:platform"], |
Paul Duffin | 7291095 | 2020-01-20 18:16:30 +0000 | [diff] [blame] | 657 | jars: ["java/exported-system-module.jar"], |
| 658 | } |
| 659 | |
| 660 | java_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 661 | name: "mysdk_system-module", |
Paul Duffin | 7291095 | 2020-01-20 18:16:30 +0000 | [diff] [blame] | 662 | prefer: false, |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 663 | visibility: ["//visibility:private"], |
| 664 | apex_available: ["//apex_available:platform"], |
| 665 | jars: ["java/system-module.jar"], |
| 666 | } |
| 667 | |
Paul Duffin | 3302871 | 2021-06-22 11:00:07 +0100 | [diff] [blame] | 668 | java_sdk_library_import { |
| 669 | name: "myjavalib", |
| 670 | prefer: false, |
| 671 | visibility: ["//visibility:public"], |
| 672 | apex_available: ["//apex_available:anyapex"], |
| 673 | shared_library: false, |
| 674 | public: { |
| 675 | jars: ["sdk_library/public/myjavalib-stubs.jar"], |
| 676 | stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], |
| 677 | current_api: "sdk_library/public/myjavalib.txt", |
| 678 | removed_api: "sdk_library/public/myjavalib-removed.txt", |
| 679 | sdk_version: "current", |
| 680 | }, |
| 681 | } |
| 682 | |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 683 | java_system_modules_import { |
| 684 | name: "my-system-modules", |
| 685 | prefer: false, |
| 686 | visibility: ["//visibility:public"], |
| 687 | libs: [ |
| 688 | "mysdk_system-module", |
| 689 | "exported-system-module", |
Paul Duffin | b97b157 | 2021-04-29 21:50:40 +0100 | [diff] [blame] | 690 | "myjavalib.stubs", |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 691 | ], |
| 692 | } |
| 693 | `), |
Paul Duffin | 7291095 | 2020-01-20 18:16:30 +0000 | [diff] [blame] | 694 | checkAllCopyRules(` |
| 695 | .intermediates/exported-system-module/android_common/turbine-combined/exported-system-module.jar -> java/exported-system-module.jar |
| 696 | .intermediates/system-module/android_common/turbine-combined/system-module.jar -> java/system-module.jar |
Paul Duffin | 3302871 | 2021-06-22 11:00:07 +0100 | [diff] [blame] | 697 | .intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar |
| 698 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt |
| 699 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt |
Paul Duffin | 7291095 | 2020-01-20 18:16:30 +0000 | [diff] [blame] | 700 | `), |
Paul Duffin | 958806b | 2022-05-16 13:10:47 +0000 | [diff] [blame] | 701 | checkInfoContents(result.Config, ` |
Paul Duffin | c6ba182 | 2022-05-06 09:38:02 +0000 | [diff] [blame] | 702 | [ |
| 703 | { |
| 704 | "@type": "sdk", |
| 705 | "@name": "mysdk", |
| 706 | "java_header_libs": [ |
| 707 | "exported-system-module", |
| 708 | "system-module" |
| 709 | ], |
| 710 | "java_sdk_libs": [ |
| 711 | "myjavalib" |
| 712 | ], |
| 713 | "java_system_modules": [ |
| 714 | "my-system-modules" |
| 715 | ] |
| 716 | }, |
| 717 | { |
| 718 | "@type": "java_library", |
| 719 | "@name": "exported-system-module" |
| 720 | }, |
| 721 | { |
| 722 | "@type": "java_system_modules", |
| 723 | "@name": "my-system-modules", |
| 724 | "@deps": [ |
| 725 | "exported-system-module", |
| 726 | "system-module" |
| 727 | ] |
| 728 | }, |
| 729 | { |
| 730 | "@type": "java_sdk_library", |
Paul Duffin | 958806b | 2022-05-16 13:10:47 +0000 | [diff] [blame] | 731 | "@name": "myjavalib", |
| 732 | "dist_stem": "myjavalib", |
| 733 | "scopes": { |
| 734 | "public": { |
| 735 | "current_api": "sdk_library/public/myjavalib.txt", |
| 736 | "latest_api": "out/soong/.intermediates/prebuilts/sdk/myjavalib.api.public.latest/gen/myjavalib.api.public.latest", |
| 737 | "latest_removed_api": "out/soong/.intermediates/prebuilts/sdk/myjavalib-removed.api.public.latest/gen/myjavalib-removed.api.public.latest", |
| 738 | "removed_api": "sdk_library/public/myjavalib-removed.txt" |
| 739 | } |
| 740 | } |
Paul Duffin | c6ba182 | 2022-05-06 09:38:02 +0000 | [diff] [blame] | 741 | }, |
| 742 | { |
| 743 | "@type": "java_library", |
| 744 | "@name": "system-module" |
| 745 | } |
| 746 | ] |
| 747 | `), |
Paul Duffin | 7b81f5e | 2020-01-13 21:03:22 +0000 | [diff] [blame] | 748 | ) |
| 749 | } |
| 750 | |
| 751 | func TestHostSnapshotWithJavaSystemModules(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 752 | result := android.GroupFixturePreparers(prepareForSdkTestWithJava).RunTestWithBp(t, ` |
Paul Duffin | 7b81f5e | 2020-01-13 21:03:22 +0000 | [diff] [blame] | 753 | sdk { |
| 754 | name: "mysdk", |
| 755 | device_supported: false, |
| 756 | host_supported: true, |
| 757 | java_system_modules: ["my-system-modules"], |
| 758 | } |
| 759 | |
| 760 | java_system_modules { |
| 761 | name: "my-system-modules", |
| 762 | device_supported: false, |
| 763 | host_supported: true, |
| 764 | libs: ["system-module"], |
| 765 | } |
| 766 | |
| 767 | java_library { |
| 768 | name: "system-module", |
| 769 | device_supported: false, |
| 770 | host_supported: true, |
| 771 | srcs: ["Test.java"], |
| 772 | sdk_version: "none", |
| 773 | system_modules: "none", |
| 774 | } |
| 775 | `) |
| 776 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 777 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 778 | checkAndroidBpContents(` |
Paul Duffin | 7b81f5e | 2020-01-13 21:03:22 +0000 | [diff] [blame] | 779 | // This is auto-generated. DO NOT EDIT. |
| 780 | |
| 781 | java_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 782 | name: "mysdk_system-module", |
| 783 | prefer: false, |
Paul Duffin | 7291095 | 2020-01-20 18:16:30 +0000 | [diff] [blame] | 784 | visibility: ["//visibility:private"], |
Martin Stjernholm | 1e04109 | 2020-11-03 00:11:09 +0000 | [diff] [blame] | 785 | apex_available: ["//apex_available:platform"], |
Paul Duffin | 7b81f5e | 2020-01-13 21:03:22 +0000 | [diff] [blame] | 786 | device_supported: false, |
| 787 | host_supported: true, |
| 788 | jars: ["java/system-module.jar"], |
| 789 | } |
| 790 | |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 791 | java_system_modules_import { |
| 792 | name: "my-system-modules", |
Paul Duffin | 7b81f5e | 2020-01-13 21:03:22 +0000 | [diff] [blame] | 793 | prefer: false, |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 794 | visibility: ["//visibility:public"], |
| 795 | device_supported: false, |
| 796 | host_supported: true, |
| 797 | libs: ["mysdk_system-module"], |
| 798 | } |
| 799 | `), |
Paul Duffin | 7b81f5e | 2020-01-13 21:03:22 +0000 | [diff] [blame] | 800 | checkAllCopyRules(".intermediates/system-module/linux_glibc_common/javac/system-module.jar -> java/system-module.jar"), |
| 801 | ) |
| 802 | } |
Paul Duffin | 865171e | 2020-03-02 18:38:15 +0000 | [diff] [blame] | 803 | |
| 804 | func TestDeviceAndHostSnapshotWithOsSpecificMembers(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 805 | result := android.GroupFixturePreparers(prepareForSdkTestWithJava).RunTestWithBp(t, ` |
Paul Duffin | 865171e | 2020-03-02 18:38:15 +0000 | [diff] [blame] | 806 | module_exports { |
| 807 | name: "myexports", |
| 808 | host_supported: true, |
| 809 | java_libs: ["myjavalib"], |
| 810 | target: { |
| 811 | android: { |
| 812 | java_header_libs: ["androidjavalib"], |
| 813 | }, |
| 814 | host: { |
| 815 | java_header_libs: ["hostjavalib"], |
| 816 | }, |
| 817 | }, |
| 818 | } |
| 819 | |
| 820 | java_library { |
| 821 | name: "myjavalib", |
| 822 | host_supported: true, |
| 823 | srcs: ["Test.java"], |
| 824 | system_modules: "none", |
| 825 | sdk_version: "none", |
| 826 | } |
| 827 | |
| 828 | java_library { |
| 829 | name: "androidjavalib", |
| 830 | srcs: ["Test.java"], |
| 831 | system_modules: "none", |
| 832 | sdk_version: "none", |
| 833 | } |
| 834 | |
| 835 | java_library_host { |
| 836 | name: "hostjavalib", |
| 837 | srcs: ["Test.java"], |
| 838 | } |
| 839 | `) |
| 840 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 841 | CheckSnapshot(t, result, "myexports", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 842 | checkAndroidBpContents(` |
Paul Duffin | 865171e | 2020-03-02 18:38:15 +0000 | [diff] [blame] | 843 | // This is auto-generated. DO NOT EDIT. |
| 844 | |
| 845 | java_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 846 | name: "hostjavalib", |
| 847 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 848 | visibility: ["//visibility:public"], |
Martin Stjernholm | 1e04109 | 2020-11-03 00:11:09 +0000 | [diff] [blame] | 849 | apex_available: ["//apex_available:platform"], |
Paul Duffin | 865171e | 2020-03-02 18:38:15 +0000 | [diff] [blame] | 850 | device_supported: false, |
| 851 | host_supported: true, |
| 852 | jars: ["java/hostjavalib.jar"], |
| 853 | } |
| 854 | |
| 855 | java_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 856 | name: "androidjavalib", |
Paul Duffin | 865171e | 2020-03-02 18:38:15 +0000 | [diff] [blame] | 857 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 858 | visibility: ["//visibility:public"], |
Martin Stjernholm | 1e04109 | 2020-11-03 00:11:09 +0000 | [diff] [blame] | 859 | apex_available: ["//apex_available:platform"], |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 860 | jars: ["java/androidjavalib.jar"], |
| 861 | } |
| 862 | |
| 863 | java_import { |
| 864 | name: "myjavalib", |
| 865 | prefer: false, |
| 866 | visibility: ["//visibility:public"], |
| 867 | apex_available: ["//apex_available:platform"], |
| 868 | host_supported: true, |
| 869 | target: { |
| 870 | android: { |
| 871 | jars: ["java/android/myjavalib.jar"], |
| 872 | }, |
| 873 | linux_glibc: { |
| 874 | jars: ["java/linux_glibc/myjavalib.jar"], |
| 875 | }, |
| 876 | }, |
| 877 | } |
| 878 | `), |
Paul Duffin | 865171e | 2020-03-02 18:38:15 +0000 | [diff] [blame] | 879 | checkAllCopyRules(` |
| 880 | .intermediates/hostjavalib/linux_glibc_common/javac/hostjavalib.jar -> java/hostjavalib.jar |
| 881 | .intermediates/androidjavalib/android_common/turbine-combined/androidjavalib.jar -> java/androidjavalib.jar |
| 882 | .intermediates/myjavalib/android_common/javac/myjavalib.jar -> java/android/myjavalib.jar |
| 883 | .intermediates/myjavalib/linux_glibc_common/javac/myjavalib.jar -> java/linux_glibc/myjavalib.jar |
| 884 | `), |
| 885 | ) |
| 886 | } |
Paul Duffin | dd46f71 | 2020-02-10 13:37:10 +0000 | [diff] [blame] | 887 | |
| 888 | func TestSnapshotWithJavaSdkLibrary(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 889 | result := android.GroupFixturePreparers(prepareForSdkTestWithJavaSdkLibrary).RunTestWithBp(t, ` |
Paul Duffin | dd46f71 | 2020-02-10 13:37:10 +0000 | [diff] [blame] | 890 | sdk { |
| 891 | name: "mysdk", |
| 892 | java_sdk_libs: ["myjavalib"], |
| 893 | } |
| 894 | |
| 895 | java_sdk_library { |
| 896 | name: "myjavalib", |
| 897 | apex_available: ["//apex_available:anyapex"], |
| 898 | srcs: ["Test.java"], |
| 899 | sdk_version: "current", |
Paul Duffin | d7eb1c2 | 2020-05-26 20:57:10 +0100 | [diff] [blame] | 900 | shared_library: false, |
Paul Duffin | 4911a89 | 2020-04-29 23:35:13 +0100 | [diff] [blame] | 901 | stubs_library_visibility: ["//other"], |
| 902 | stubs_source_visibility: ["//another"], |
Paul Duffin | 869de14 | 2021-07-15 14:14:41 +0100 | [diff] [blame] | 903 | permitted_packages: ["pkg.myjavalib"], |
Paul Duffin | dd46f71 | 2020-02-10 13:37:10 +0000 | [diff] [blame] | 904 | } |
| 905 | `) |
| 906 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 907 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 908 | checkAndroidBpContents(` |
Paul Duffin | dd46f71 | 2020-02-10 13:37:10 +0000 | [diff] [blame] | 909 | // This is auto-generated. DO NOT EDIT. |
| 910 | |
| 911 | java_sdk_library_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 912 | name: "myjavalib", |
| 913 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 914 | visibility: ["//visibility:public"], |
Paul Duffin | dd46f71 | 2020-02-10 13:37:10 +0000 | [diff] [blame] | 915 | apex_available: ["//apex_available:anyapex"], |
Paul Duffin | d7eb1c2 | 2020-05-26 20:57:10 +0100 | [diff] [blame] | 916 | shared_library: false, |
Paul Duffin | 869de14 | 2021-07-15 14:14:41 +0100 | [diff] [blame] | 917 | permitted_packages: ["pkg.myjavalib"], |
Paul Duffin | dd46f71 | 2020-02-10 13:37:10 +0000 | [diff] [blame] | 918 | public: { |
| 919 | jars: ["sdk_library/public/myjavalib-stubs.jar"], |
Paul Duffin | ab5ac8f | 2020-11-18 16:37:35 +0000 | [diff] [blame] | 920 | stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], |
Paul Duffin | 1fd005d | 2020-04-09 01:08:11 +0100 | [diff] [blame] | 921 | current_api: "sdk_library/public/myjavalib.txt", |
| 922 | removed_api: "sdk_library/public/myjavalib-removed.txt", |
Paul Duffin | dd46f71 | 2020-02-10 13:37:10 +0000 | [diff] [blame] | 923 | sdk_version: "current", |
| 924 | }, |
| 925 | system: { |
| 926 | jars: ["sdk_library/system/myjavalib-stubs.jar"], |
Paul Duffin | ab5ac8f | 2020-11-18 16:37:35 +0000 | [diff] [blame] | 927 | stub_srcs: ["sdk_library/system/myjavalib_stub_sources"], |
Paul Duffin | 1fd005d | 2020-04-09 01:08:11 +0100 | [diff] [blame] | 928 | current_api: "sdk_library/system/myjavalib.txt", |
| 929 | removed_api: "sdk_library/system/myjavalib-removed.txt", |
Paul Duffin | dd46f71 | 2020-02-10 13:37:10 +0000 | [diff] [blame] | 930 | sdk_version: "system_current", |
| 931 | }, |
| 932 | test: { |
| 933 | jars: ["sdk_library/test/myjavalib-stubs.jar"], |
Paul Duffin | ab5ac8f | 2020-11-18 16:37:35 +0000 | [diff] [blame] | 934 | stub_srcs: ["sdk_library/test/myjavalib_stub_sources"], |
Paul Duffin | 1fd005d | 2020-04-09 01:08:11 +0100 | [diff] [blame] | 935 | current_api: "sdk_library/test/myjavalib.txt", |
| 936 | removed_api: "sdk_library/test/myjavalib-removed.txt", |
Paul Duffin | dd46f71 | 2020-02-10 13:37:10 +0000 | [diff] [blame] | 937 | sdk_version: "test_current", |
| 938 | }, |
| 939 | } |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 940 | `), |
Paul Duffin | dd46f71 | 2020-02-10 13:37:10 +0000 | [diff] [blame] | 941 | checkAllCopyRules(` |
| 942 | .intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar |
Colin Cross | cb77f75 | 2021-03-24 12:04:44 -0700 | [diff] [blame] | 943 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt |
| 944 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt |
Paul Duffin | dd46f71 | 2020-02-10 13:37:10 +0000 | [diff] [blame] | 945 | .intermediates/myjavalib.stubs.system/android_common/javac/myjavalib.stubs.system.jar -> sdk_library/system/myjavalib-stubs.jar |
Colin Cross | cb77f75 | 2021-03-24 12:04:44 -0700 | [diff] [blame] | 946 | .intermediates/myjavalib.stubs.source.system/android_common/metalava/myjavalib.stubs.source.system_api.txt -> sdk_library/system/myjavalib.txt |
| 947 | .intermediates/myjavalib.stubs.source.system/android_common/metalava/myjavalib.stubs.source.system_removed.txt -> sdk_library/system/myjavalib-removed.txt |
Paul Duffin | dd46f71 | 2020-02-10 13:37:10 +0000 | [diff] [blame] | 948 | .intermediates/myjavalib.stubs.test/android_common/javac/myjavalib.stubs.test.jar -> sdk_library/test/myjavalib-stubs.jar |
Colin Cross | cb77f75 | 2021-03-24 12:04:44 -0700 | [diff] [blame] | 949 | .intermediates/myjavalib.stubs.source.test/android_common/metalava/myjavalib.stubs.source.test_api.txt -> sdk_library/test/myjavalib.txt |
| 950 | .intermediates/myjavalib.stubs.source.test/android_common/metalava/myjavalib.stubs.source.test_removed.txt -> sdk_library/test/myjavalib-removed.txt |
Paul Duffin | dd46f71 | 2020-02-10 13:37:10 +0000 | [diff] [blame] | 951 | `), |
Paul Duffin | 3d1248c | 2020-04-09 00:10:17 +0100 | [diff] [blame] | 952 | checkMergeZips( |
| 953 | ".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip", |
| 954 | ".intermediates/mysdk/common_os/tmp/sdk_library/system/myjavalib_stub_sources.zip", |
Paul Duffin | 3302871 | 2021-06-22 11:00:07 +0100 | [diff] [blame] | 955 | ".intermediates/mysdk/common_os/tmp/sdk_library/test/myjavalib_stub_sources.zip", |
| 956 | ), |
Paul Duffin | dd46f71 | 2020-02-10 13:37:10 +0000 | [diff] [blame] | 957 | ) |
| 958 | } |
Paul Duffin | 3375e35 | 2020-04-28 10:44:03 +0100 | [diff] [blame] | 959 | |
Paul Duffin | e840995 | 2022-09-22 16:24:46 +0100 | [diff] [blame] | 960 | func TestSnapshotWithJavaSdkLibrary_DistStem(t *testing.T) { |
| 961 | result := android.GroupFixturePreparers(prepareForSdkTestWithJavaSdkLibrary).RunTestWithBp(t, ` |
| 962 | sdk { |
| 963 | name: "mysdk", |
| 964 | java_sdk_libs: ["myjavalib-foo"], |
| 965 | } |
| 966 | |
| 967 | java_sdk_library { |
| 968 | name: "myjavalib-foo", |
| 969 | apex_available: ["//apex_available:anyapex"], |
| 970 | srcs: ["Test.java"], |
| 971 | sdk_version: "current", |
| 972 | shared_library: false, |
| 973 | public: { |
| 974 | enabled: true, |
| 975 | }, |
| 976 | dist_stem: "myjavalib", |
| 977 | } |
| 978 | `) |
| 979 | |
| 980 | CheckSnapshot(t, result, "mysdk", "", |
| 981 | checkAndroidBpContents(` |
| 982 | // This is auto-generated. DO NOT EDIT. |
| 983 | |
| 984 | java_sdk_library_import { |
| 985 | name: "myjavalib-foo", |
| 986 | prefer: false, |
| 987 | visibility: ["//visibility:public"], |
| 988 | apex_available: ["//apex_available:anyapex"], |
| 989 | shared_library: false, |
| 990 | public: { |
| 991 | jars: ["sdk_library/public/myjavalib-stubs.jar"], |
| 992 | stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], |
| 993 | current_api: "sdk_library/public/myjavalib.txt", |
| 994 | removed_api: "sdk_library/public/myjavalib-removed.txt", |
| 995 | sdk_version: "current", |
| 996 | }, |
| 997 | } |
| 998 | `), |
| 999 | checkAllCopyRules(` |
| 1000 | .intermediates/myjavalib-foo.stubs/android_common/javac/myjavalib-foo.stubs.jar -> sdk_library/public/myjavalib-stubs.jar |
| 1001 | .intermediates/myjavalib-foo.stubs.source/android_common/metalava/myjavalib-foo.stubs.source_api.txt -> sdk_library/public/myjavalib.txt |
| 1002 | .intermediates/myjavalib-foo.stubs.source/android_common/metalava/myjavalib-foo.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt |
| 1003 | `), |
| 1004 | checkMergeZips( |
| 1005 | ".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip", |
| 1006 | ), |
| 1007 | ) |
| 1008 | } |
| 1009 | |
Paul Duffin | 22628d5 | 2021-05-12 23:13:22 +0100 | [diff] [blame] | 1010 | func TestSnapshotWithJavaSdkLibrary_UseSrcJar(t *testing.T) { |
| 1011 | result := android.GroupFixturePreparers( |
| 1012 | prepareForSdkTestWithJavaSdkLibrary, |
| 1013 | android.FixtureMergeEnv(map[string]string{ |
| 1014 | "SOONG_SDK_SNAPSHOT_USE_SRCJAR": "true", |
| 1015 | }), |
| 1016 | ).RunTestWithBp(t, ` |
| 1017 | sdk { |
| 1018 | name: "mysdk", |
| 1019 | java_sdk_libs: ["myjavalib"], |
| 1020 | } |
| 1021 | |
| 1022 | java_sdk_library { |
| 1023 | name: "myjavalib", |
| 1024 | srcs: ["Test.java"], |
| 1025 | sdk_version: "current", |
| 1026 | shared_library: false, |
| 1027 | public: { |
| 1028 | enabled: true, |
| 1029 | }, |
| 1030 | } |
| 1031 | `) |
| 1032 | |
| 1033 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 1034 | checkAndroidBpContents(` |
Paul Duffin | 22628d5 | 2021-05-12 23:13:22 +0100 | [diff] [blame] | 1035 | // This is auto-generated. DO NOT EDIT. |
| 1036 | |
| 1037 | java_sdk_library_import { |
| 1038 | name: "myjavalib", |
| 1039 | prefer: false, |
| 1040 | visibility: ["//visibility:public"], |
| 1041 | apex_available: ["//apex_available:platform"], |
| 1042 | shared_library: false, |
| 1043 | public: { |
| 1044 | jars: ["sdk_library/public/myjavalib-stubs.jar"], |
| 1045 | stub_srcs: ["sdk_library/public/myjavalib.srcjar"], |
| 1046 | current_api: "sdk_library/public/myjavalib.txt", |
| 1047 | removed_api: "sdk_library/public/myjavalib-removed.txt", |
| 1048 | sdk_version: "current", |
| 1049 | }, |
| 1050 | } |
| 1051 | `), |
| 1052 | checkAllCopyRules(` |
| 1053 | .intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar |
| 1054 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source-stubs.srcjar -> sdk_library/public/myjavalib.srcjar |
| 1055 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt |
| 1056 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt |
| 1057 | `), |
| 1058 | ) |
| 1059 | } |
| 1060 | |
Anton Hansson | d78eb76 | 2021-09-21 15:25:12 +0100 | [diff] [blame] | 1061 | func TestSnapshotWithJavaSdkLibrary_AnnotationsZip(t *testing.T) { |
| 1062 | result := android.GroupFixturePreparers(prepareForSdkTestWithJavaSdkLibrary).RunTestWithBp(t, ` |
| 1063 | sdk { |
| 1064 | name: "mysdk", |
| 1065 | java_sdk_libs: ["myjavalib"], |
| 1066 | } |
| 1067 | |
| 1068 | java_sdk_library { |
| 1069 | name: "myjavalib", |
| 1070 | srcs: ["Test.java"], |
| 1071 | sdk_version: "current", |
| 1072 | shared_library: false, |
| 1073 | annotations_enabled: true, |
| 1074 | public: { |
| 1075 | enabled: true, |
| 1076 | }, |
| 1077 | } |
| 1078 | `) |
| 1079 | |
| 1080 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 1081 | checkAndroidBpContents(` |
Anton Hansson | d78eb76 | 2021-09-21 15:25:12 +0100 | [diff] [blame] | 1082 | // This is auto-generated. DO NOT EDIT. |
| 1083 | |
| 1084 | java_sdk_library_import { |
| 1085 | name: "myjavalib", |
| 1086 | prefer: false, |
| 1087 | visibility: ["//visibility:public"], |
| 1088 | apex_available: ["//apex_available:platform"], |
| 1089 | shared_library: false, |
| 1090 | public: { |
| 1091 | jars: ["sdk_library/public/myjavalib-stubs.jar"], |
| 1092 | stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], |
| 1093 | current_api: "sdk_library/public/myjavalib.txt", |
| 1094 | removed_api: "sdk_library/public/myjavalib-removed.txt", |
| 1095 | annotations: "sdk_library/public/myjavalib_annotations.zip", |
| 1096 | sdk_version: "current", |
| 1097 | }, |
| 1098 | } |
| 1099 | `), |
| 1100 | checkAllCopyRules(` |
| 1101 | .intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar |
| 1102 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt |
| 1103 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt |
| 1104 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_annotations.zip -> sdk_library/public/myjavalib_annotations.zip |
| 1105 | `), |
| 1106 | checkMergeZips(".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip"), |
| 1107 | ) |
| 1108 | } |
| 1109 | |
Paul Duffin | a54016c | 2022-01-27 16:39:47 +0000 | [diff] [blame] | 1110 | func TestSnapshotWithJavaSdkLibrary_AnnotationsZip_PreT(t *testing.T) { |
| 1111 | result := android.GroupFixturePreparers( |
| 1112 | prepareForSdkTestWithJavaSdkLibrary, |
| 1113 | android.FixtureMergeEnv(map[string]string{ |
| 1114 | "SOONG_SDK_SNAPSHOT_TARGET_BUILD_RELEASE": "S", |
| 1115 | }), |
| 1116 | ).RunTestWithBp(t, ` |
| 1117 | sdk { |
| 1118 | name: "mysdk", |
| 1119 | java_sdk_libs: ["myjavalib"], |
| 1120 | } |
| 1121 | |
| 1122 | java_sdk_library { |
| 1123 | name: "myjavalib", |
| 1124 | srcs: ["Test.java"], |
Paul Duffin | 1938dba | 2022-07-26 23:53:00 +0000 | [diff] [blame] | 1125 | sdk_version: "S", |
Paul Duffin | a54016c | 2022-01-27 16:39:47 +0000 | [diff] [blame] | 1126 | shared_library: false, |
| 1127 | annotations_enabled: true, |
| 1128 | public: { |
| 1129 | enabled: true, |
| 1130 | }, |
| 1131 | } |
| 1132 | `) |
| 1133 | |
| 1134 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 1135 | checkAndroidBpContents(` |
Paul Duffin | a54016c | 2022-01-27 16:39:47 +0000 | [diff] [blame] | 1136 | // This is auto-generated. DO NOT EDIT. |
| 1137 | |
| 1138 | java_sdk_library_import { |
| 1139 | name: "myjavalib", |
| 1140 | prefer: false, |
| 1141 | visibility: ["//visibility:public"], |
| 1142 | apex_available: ["//apex_available:platform"], |
| 1143 | shared_library: false, |
| 1144 | public: { |
| 1145 | jars: ["sdk_library/public/myjavalib-stubs.jar"], |
| 1146 | stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], |
| 1147 | current_api: "sdk_library/public/myjavalib.txt", |
| 1148 | removed_api: "sdk_library/public/myjavalib-removed.txt", |
| 1149 | sdk_version: "current", |
| 1150 | }, |
| 1151 | } |
| 1152 | `), |
| 1153 | checkAllCopyRules(` |
| 1154 | .intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar |
| 1155 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt |
| 1156 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt |
| 1157 | `), |
| 1158 | checkMergeZips(".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip"), |
| 1159 | ) |
| 1160 | } |
| 1161 | |
Paul Duffin | 1267d87 | 2021-04-16 17:21:36 +0100 | [diff] [blame] | 1162 | func TestSnapshotWithJavaSdkLibrary_CompileDex(t *testing.T) { |
| 1163 | result := android.GroupFixturePreparers(prepareForSdkTestWithJavaSdkLibrary).RunTestWithBp(t, ` |
| 1164 | sdk { |
| 1165 | name: "mysdk", |
| 1166 | java_sdk_libs: ["myjavalib"], |
| 1167 | } |
| 1168 | |
| 1169 | java_sdk_library { |
| 1170 | name: "myjavalib", |
| 1171 | srcs: ["Test.java"], |
| 1172 | sdk_version: "current", |
| 1173 | shared_library: false, |
| 1174 | compile_dex: true, |
| 1175 | public: { |
| 1176 | enabled: true, |
| 1177 | }, |
| 1178 | system: { |
| 1179 | enabled: true, |
| 1180 | }, |
| 1181 | } |
| 1182 | `) |
| 1183 | |
| 1184 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 1185 | checkAndroidBpContents(` |
Paul Duffin | 1267d87 | 2021-04-16 17:21:36 +0100 | [diff] [blame] | 1186 | // This is auto-generated. DO NOT EDIT. |
| 1187 | |
| 1188 | java_sdk_library_import { |
| 1189 | name: "myjavalib", |
| 1190 | prefer: false, |
| 1191 | visibility: ["//visibility:public"], |
| 1192 | apex_available: ["//apex_available:platform"], |
| 1193 | shared_library: false, |
| 1194 | compile_dex: true, |
| 1195 | public: { |
| 1196 | jars: ["sdk_library/public/myjavalib-stubs.jar"], |
| 1197 | stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], |
| 1198 | current_api: "sdk_library/public/myjavalib.txt", |
| 1199 | removed_api: "sdk_library/public/myjavalib-removed.txt", |
| 1200 | sdk_version: "current", |
| 1201 | }, |
| 1202 | system: { |
| 1203 | jars: ["sdk_library/system/myjavalib-stubs.jar"], |
| 1204 | stub_srcs: ["sdk_library/system/myjavalib_stub_sources"], |
| 1205 | current_api: "sdk_library/system/myjavalib.txt", |
| 1206 | removed_api: "sdk_library/system/myjavalib-removed.txt", |
| 1207 | sdk_version: "system_current", |
| 1208 | }, |
| 1209 | } |
| 1210 | `), |
| 1211 | snapshotTestChecker(checkSnapshotWithSourcePreferred, func(t *testing.T, result *android.TestResult) { |
| 1212 | ctx := android.ModuleInstallPathContextForTesting(result.Config) |
| 1213 | dexJarBuildPath := func(name string, kind android.SdkKind) string { |
| 1214 | dep := result.Module(name, "android_common").(java.SdkLibraryDependency) |
Martin Stjernholm | 8be1e6d | 2021-09-15 03:34:04 +0100 | [diff] [blame] | 1215 | path := dep.SdkApiStubDexJar(ctx, kind).Path() |
Paul Duffin | 1267d87 | 2021-04-16 17:21:36 +0100 | [diff] [blame] | 1216 | return path.RelativeToTop().String() |
| 1217 | } |
| 1218 | |
| 1219 | dexJarPath := dexJarBuildPath("myjavalib", android.SdkPublic) |
| 1220 | android.AssertStringEquals(t, "source dex public stubs jar build path", "out/soong/.intermediates/myjavalib.stubs/android_common/dex/myjavalib.stubs.jar", dexJarPath) |
| 1221 | |
| 1222 | dexJarPath = dexJarBuildPath("myjavalib", android.SdkSystem) |
| 1223 | systemDexJar := "out/soong/.intermediates/myjavalib.stubs.system/android_common/dex/myjavalib.stubs.system.jar" |
| 1224 | android.AssertStringEquals(t, "source dex system stubs jar build path", systemDexJar, dexJarPath) |
| 1225 | |
| 1226 | // This should fall back to system as module is not available. |
| 1227 | dexJarPath = dexJarBuildPath("myjavalib", android.SdkModule) |
| 1228 | android.AssertStringEquals(t, "source dex module stubs jar build path", systemDexJar, dexJarPath) |
| 1229 | |
| 1230 | dexJarPath = dexJarBuildPath(android.PrebuiltNameFromSource("myjavalib"), android.SdkPublic) |
| 1231 | android.AssertStringEquals(t, "prebuilt dex public stubs jar build path", "out/soong/.intermediates/snapshot/prebuilt_myjavalib.stubs/android_common/dex/myjavalib.stubs.jar", dexJarPath) |
| 1232 | }), |
| 1233 | ) |
| 1234 | } |
| 1235 | |
Paul Duffin | 780c5f4 | 2020-05-12 15:52:55 +0100 | [diff] [blame] | 1236 | func TestSnapshotWithJavaSdkLibrary_SdkVersion_None(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 1237 | result := android.GroupFixturePreparers(prepareForSdkTestWithJavaSdkLibrary).RunTestWithBp(t, ` |
Paul Duffin | 780c5f4 | 2020-05-12 15:52:55 +0100 | [diff] [blame] | 1238 | sdk { |
| 1239 | name: "mysdk", |
| 1240 | java_sdk_libs: ["myjavalib"], |
| 1241 | } |
| 1242 | |
| 1243 | java_sdk_library { |
| 1244 | name: "myjavalib", |
| 1245 | srcs: ["Test.java"], |
| 1246 | sdk_version: "none", |
| 1247 | system_modules: "none", |
| 1248 | } |
| 1249 | `) |
| 1250 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 1251 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 1252 | checkAndroidBpContents(` |
Paul Duffin | 780c5f4 | 2020-05-12 15:52:55 +0100 | [diff] [blame] | 1253 | // This is auto-generated. DO NOT EDIT. |
| 1254 | |
| 1255 | java_sdk_library_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 1256 | name: "myjavalib", |
| 1257 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 1258 | visibility: ["//visibility:public"], |
Martin Stjernholm | 1e04109 | 2020-11-03 00:11:09 +0000 | [diff] [blame] | 1259 | apex_available: ["//apex_available:platform"], |
Paul Duffin | d7eb1c2 | 2020-05-26 20:57:10 +0100 | [diff] [blame] | 1260 | shared_library: true, |
Paul Duffin | 780c5f4 | 2020-05-12 15:52:55 +0100 | [diff] [blame] | 1261 | public: { |
| 1262 | jars: ["sdk_library/public/myjavalib-stubs.jar"], |
Paul Duffin | ab5ac8f | 2020-11-18 16:37:35 +0000 | [diff] [blame] | 1263 | stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], |
Paul Duffin | 780c5f4 | 2020-05-12 15:52:55 +0100 | [diff] [blame] | 1264 | current_api: "sdk_library/public/myjavalib.txt", |
| 1265 | removed_api: "sdk_library/public/myjavalib-removed.txt", |
| 1266 | sdk_version: "none", |
| 1267 | }, |
| 1268 | } |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 1269 | `), |
Paul Duffin | 780c5f4 | 2020-05-12 15:52:55 +0100 | [diff] [blame] | 1270 | checkAllCopyRules(` |
| 1271 | .intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar |
Colin Cross | cb77f75 | 2021-03-24 12:04:44 -0700 | [diff] [blame] | 1272 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt |
| 1273 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt |
Paul Duffin | 780c5f4 | 2020-05-12 15:52:55 +0100 | [diff] [blame] | 1274 | `), |
| 1275 | checkMergeZips( |
| 1276 | ".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip", |
| 1277 | ), |
| 1278 | ) |
| 1279 | } |
| 1280 | |
Paul Duffin | 87a05a3 | 2020-05-12 11:50:28 +0100 | [diff] [blame] | 1281 | func TestSnapshotWithJavaSdkLibrary_SdkVersion_ForScope(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 1282 | result := android.GroupFixturePreparers(prepareForSdkTestWithJavaSdkLibrary).RunTestWithBp(t, ` |
Paul Duffin | 87a05a3 | 2020-05-12 11:50:28 +0100 | [diff] [blame] | 1283 | sdk { |
| 1284 | name: "mysdk", |
| 1285 | java_sdk_libs: ["myjavalib"], |
| 1286 | } |
| 1287 | |
| 1288 | java_sdk_library { |
| 1289 | name: "myjavalib", |
| 1290 | srcs: ["Test.java"], |
| 1291 | sdk_version: "module_current", |
| 1292 | public: { |
| 1293 | enabled: true, |
| 1294 | sdk_version: "module_current", |
| 1295 | }, |
| 1296 | } |
| 1297 | `) |
| 1298 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 1299 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 1300 | checkAndroidBpContents(` |
Paul Duffin | 87a05a3 | 2020-05-12 11:50:28 +0100 | [diff] [blame] | 1301 | // This is auto-generated. DO NOT EDIT. |
| 1302 | |
| 1303 | java_sdk_library_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 1304 | name: "myjavalib", |
| 1305 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 1306 | visibility: ["//visibility:public"], |
Martin Stjernholm | 1e04109 | 2020-11-03 00:11:09 +0000 | [diff] [blame] | 1307 | apex_available: ["//apex_available:platform"], |
Paul Duffin | d7eb1c2 | 2020-05-26 20:57:10 +0100 | [diff] [blame] | 1308 | shared_library: true, |
Paul Duffin | 87a05a3 | 2020-05-12 11:50:28 +0100 | [diff] [blame] | 1309 | public: { |
| 1310 | jars: ["sdk_library/public/myjavalib-stubs.jar"], |
Paul Duffin | ab5ac8f | 2020-11-18 16:37:35 +0000 | [diff] [blame] | 1311 | stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], |
Paul Duffin | 87a05a3 | 2020-05-12 11:50:28 +0100 | [diff] [blame] | 1312 | current_api: "sdk_library/public/myjavalib.txt", |
| 1313 | removed_api: "sdk_library/public/myjavalib-removed.txt", |
| 1314 | sdk_version: "module_current", |
| 1315 | }, |
| 1316 | } |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 1317 | `), |
Paul Duffin | 87a05a3 | 2020-05-12 11:50:28 +0100 | [diff] [blame] | 1318 | checkAllCopyRules(` |
| 1319 | .intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar |
Colin Cross | cb77f75 | 2021-03-24 12:04:44 -0700 | [diff] [blame] | 1320 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt |
| 1321 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt |
Paul Duffin | 87a05a3 | 2020-05-12 11:50:28 +0100 | [diff] [blame] | 1322 | `), |
| 1323 | checkMergeZips( |
| 1324 | ".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip", |
| 1325 | ), |
| 1326 | ) |
| 1327 | } |
| 1328 | |
| 1329 | func TestSnapshotWithJavaSdkLibrary_ApiScopes(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 1330 | result := android.GroupFixturePreparers(prepareForSdkTestWithJavaSdkLibrary).RunTestWithBp(t, ` |
Paul Duffin | 3375e35 | 2020-04-28 10:44:03 +0100 | [diff] [blame] | 1331 | sdk { |
| 1332 | name: "mysdk", |
| 1333 | java_sdk_libs: ["myjavalib"], |
| 1334 | } |
| 1335 | |
| 1336 | java_sdk_library { |
| 1337 | name: "myjavalib", |
| 1338 | apex_available: ["//apex_available:anyapex"], |
| 1339 | srcs: ["Test.java"], |
| 1340 | sdk_version: "current", |
| 1341 | public: { |
| 1342 | enabled: true, |
| 1343 | }, |
| 1344 | system: { |
| 1345 | enabled: true, |
| 1346 | }, |
| 1347 | } |
| 1348 | `) |
| 1349 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 1350 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 1351 | checkAndroidBpContents(` |
Paul Duffin | 3375e35 | 2020-04-28 10:44:03 +0100 | [diff] [blame] | 1352 | // This is auto-generated. DO NOT EDIT. |
| 1353 | |
| 1354 | java_sdk_library_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 1355 | name: "myjavalib", |
| 1356 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 1357 | visibility: ["//visibility:public"], |
Paul Duffin | 3375e35 | 2020-04-28 10:44:03 +0100 | [diff] [blame] | 1358 | apex_available: ["//apex_available:anyapex"], |
Paul Duffin | d7eb1c2 | 2020-05-26 20:57:10 +0100 | [diff] [blame] | 1359 | shared_library: true, |
Paul Duffin | 3375e35 | 2020-04-28 10:44:03 +0100 | [diff] [blame] | 1360 | public: { |
| 1361 | jars: ["sdk_library/public/myjavalib-stubs.jar"], |
Paul Duffin | ab5ac8f | 2020-11-18 16:37:35 +0000 | [diff] [blame] | 1362 | stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], |
Paul Duffin | 3375e35 | 2020-04-28 10:44:03 +0100 | [diff] [blame] | 1363 | current_api: "sdk_library/public/myjavalib.txt", |
| 1364 | removed_api: "sdk_library/public/myjavalib-removed.txt", |
| 1365 | sdk_version: "current", |
| 1366 | }, |
| 1367 | system: { |
| 1368 | jars: ["sdk_library/system/myjavalib-stubs.jar"], |
Paul Duffin | ab5ac8f | 2020-11-18 16:37:35 +0000 | [diff] [blame] | 1369 | stub_srcs: ["sdk_library/system/myjavalib_stub_sources"], |
Paul Duffin | 3375e35 | 2020-04-28 10:44:03 +0100 | [diff] [blame] | 1370 | current_api: "sdk_library/system/myjavalib.txt", |
| 1371 | removed_api: "sdk_library/system/myjavalib-removed.txt", |
| 1372 | sdk_version: "system_current", |
| 1373 | }, |
| 1374 | } |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 1375 | `), |
Paul Duffin | 3375e35 | 2020-04-28 10:44:03 +0100 | [diff] [blame] | 1376 | checkAllCopyRules(` |
| 1377 | .intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar |
Colin Cross | cb77f75 | 2021-03-24 12:04:44 -0700 | [diff] [blame] | 1378 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt |
| 1379 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt |
Paul Duffin | 3375e35 | 2020-04-28 10:44:03 +0100 | [diff] [blame] | 1380 | .intermediates/myjavalib.stubs.system/android_common/javac/myjavalib.stubs.system.jar -> sdk_library/system/myjavalib-stubs.jar |
Colin Cross | cb77f75 | 2021-03-24 12:04:44 -0700 | [diff] [blame] | 1381 | .intermediates/myjavalib.stubs.source.system/android_common/metalava/myjavalib.stubs.source.system_api.txt -> sdk_library/system/myjavalib.txt |
| 1382 | .intermediates/myjavalib.stubs.source.system/android_common/metalava/myjavalib.stubs.source.system_removed.txt -> sdk_library/system/myjavalib-removed.txt |
Paul Duffin | 3375e35 | 2020-04-28 10:44:03 +0100 | [diff] [blame] | 1383 | `), |
| 1384 | checkMergeZips( |
| 1385 | ".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip", |
| 1386 | ".intermediates/mysdk/common_os/tmp/sdk_library/system/myjavalib_stub_sources.zip", |
| 1387 | ), |
| 1388 | ) |
| 1389 | } |
Paul Duffin | 8f265b9 | 2020-04-28 14:13:56 +0100 | [diff] [blame] | 1390 | |
| 1391 | func TestSnapshotWithJavaSdkLibrary_ModuleLib(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 1392 | result := android.GroupFixturePreparers(prepareForSdkTestWithJavaSdkLibrary).RunTestWithBp(t, ` |
Paul Duffin | 8f265b9 | 2020-04-28 14:13:56 +0100 | [diff] [blame] | 1393 | sdk { |
| 1394 | name: "mysdk", |
| 1395 | java_sdk_libs: ["myjavalib"], |
| 1396 | } |
| 1397 | |
| 1398 | java_sdk_library { |
| 1399 | name: "myjavalib", |
| 1400 | apex_available: ["//apex_available:anyapex"], |
| 1401 | srcs: ["Test.java"], |
| 1402 | sdk_version: "current", |
| 1403 | public: { |
| 1404 | enabled: true, |
| 1405 | }, |
| 1406 | system: { |
| 1407 | enabled: true, |
| 1408 | }, |
| 1409 | module_lib: { |
| 1410 | enabled: true, |
| 1411 | }, |
| 1412 | } |
| 1413 | `) |
| 1414 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 1415 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 1416 | checkAndroidBpContents(` |
Paul Duffin | 8f265b9 | 2020-04-28 14:13:56 +0100 | [diff] [blame] | 1417 | // This is auto-generated. DO NOT EDIT. |
| 1418 | |
| 1419 | java_sdk_library_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 1420 | name: "myjavalib", |
| 1421 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 1422 | visibility: ["//visibility:public"], |
Paul Duffin | 8f265b9 | 2020-04-28 14:13:56 +0100 | [diff] [blame] | 1423 | apex_available: ["//apex_available:anyapex"], |
Paul Duffin | d7eb1c2 | 2020-05-26 20:57:10 +0100 | [diff] [blame] | 1424 | shared_library: true, |
Paul Duffin | 8f265b9 | 2020-04-28 14:13:56 +0100 | [diff] [blame] | 1425 | public: { |
| 1426 | jars: ["sdk_library/public/myjavalib-stubs.jar"], |
Paul Duffin | ab5ac8f | 2020-11-18 16:37:35 +0000 | [diff] [blame] | 1427 | stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], |
Paul Duffin | 8f265b9 | 2020-04-28 14:13:56 +0100 | [diff] [blame] | 1428 | current_api: "sdk_library/public/myjavalib.txt", |
| 1429 | removed_api: "sdk_library/public/myjavalib-removed.txt", |
| 1430 | sdk_version: "current", |
| 1431 | }, |
| 1432 | system: { |
| 1433 | jars: ["sdk_library/system/myjavalib-stubs.jar"], |
Paul Duffin | ab5ac8f | 2020-11-18 16:37:35 +0000 | [diff] [blame] | 1434 | stub_srcs: ["sdk_library/system/myjavalib_stub_sources"], |
Paul Duffin | 8f265b9 | 2020-04-28 14:13:56 +0100 | [diff] [blame] | 1435 | current_api: "sdk_library/system/myjavalib.txt", |
| 1436 | removed_api: "sdk_library/system/myjavalib-removed.txt", |
| 1437 | sdk_version: "system_current", |
| 1438 | }, |
| 1439 | module_lib: { |
Paul Duffin | 6b836ba | 2020-05-13 19:19:49 +0100 | [diff] [blame] | 1440 | jars: ["sdk_library/module-lib/myjavalib-stubs.jar"], |
Paul Duffin | ab5ac8f | 2020-11-18 16:37:35 +0000 | [diff] [blame] | 1441 | stub_srcs: ["sdk_library/module-lib/myjavalib_stub_sources"], |
Paul Duffin | 6b836ba | 2020-05-13 19:19:49 +0100 | [diff] [blame] | 1442 | current_api: "sdk_library/module-lib/myjavalib.txt", |
| 1443 | removed_api: "sdk_library/module-lib/myjavalib-removed.txt", |
Paul Duffin | 8f265b9 | 2020-04-28 14:13:56 +0100 | [diff] [blame] | 1444 | sdk_version: "module_current", |
| 1445 | }, |
| 1446 | } |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 1447 | `), |
Paul Duffin | 8f265b9 | 2020-04-28 14:13:56 +0100 | [diff] [blame] | 1448 | checkAllCopyRules(` |
| 1449 | .intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar |
Colin Cross | cb77f75 | 2021-03-24 12:04:44 -0700 | [diff] [blame] | 1450 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt |
| 1451 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt |
Paul Duffin | 8f265b9 | 2020-04-28 14:13:56 +0100 | [diff] [blame] | 1452 | .intermediates/myjavalib.stubs.system/android_common/javac/myjavalib.stubs.system.jar -> sdk_library/system/myjavalib-stubs.jar |
Colin Cross | cb77f75 | 2021-03-24 12:04:44 -0700 | [diff] [blame] | 1453 | .intermediates/myjavalib.stubs.source.system/android_common/metalava/myjavalib.stubs.source.system_api.txt -> sdk_library/system/myjavalib.txt |
| 1454 | .intermediates/myjavalib.stubs.source.system/android_common/metalava/myjavalib.stubs.source.system_removed.txt -> sdk_library/system/myjavalib-removed.txt |
Paul Duffin | 6b836ba | 2020-05-13 19:19:49 +0100 | [diff] [blame] | 1455 | .intermediates/myjavalib.stubs.module_lib/android_common/javac/myjavalib.stubs.module_lib.jar -> sdk_library/module-lib/myjavalib-stubs.jar |
Colin Cross | cb77f75 | 2021-03-24 12:04:44 -0700 | [diff] [blame] | 1456 | .intermediates/myjavalib.stubs.source.module_lib/android_common/metalava/myjavalib.stubs.source.module_lib_api.txt -> sdk_library/module-lib/myjavalib.txt |
| 1457 | .intermediates/myjavalib.stubs.source.module_lib/android_common/metalava/myjavalib.stubs.source.module_lib_removed.txt -> sdk_library/module-lib/myjavalib-removed.txt |
Paul Duffin | 8f265b9 | 2020-04-28 14:13:56 +0100 | [diff] [blame] | 1458 | `), |
| 1459 | checkMergeZips( |
Paul Duffin | 74f1dcd | 2022-07-18 13:18:23 +0000 | [diff] [blame] | 1460 | ".intermediates/mysdk/common_os/tmp/sdk_library/module-lib/myjavalib_stub_sources.zip", |
Paul Duffin | 8f265b9 | 2020-04-28 14:13:56 +0100 | [diff] [blame] | 1461 | ".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip", |
| 1462 | ".intermediates/mysdk/common_os/tmp/sdk_library/system/myjavalib_stub_sources.zip", |
Paul Duffin | 8f265b9 | 2020-04-28 14:13:56 +0100 | [diff] [blame] | 1463 | ), |
| 1464 | ) |
| 1465 | } |
Paul Duffin | f7a6433 | 2020-05-13 16:54:55 +0100 | [diff] [blame] | 1466 | |
Paul Duffin | 0c5bae5 | 2020-06-02 13:00:08 +0100 | [diff] [blame] | 1467 | func TestSnapshotWithJavaSdkLibrary_SystemServer(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 1468 | result := android.GroupFixturePreparers(prepareForSdkTestWithJavaSdkLibrary).RunTestWithBp(t, ` |
Paul Duffin | 0c5bae5 | 2020-06-02 13:00:08 +0100 | [diff] [blame] | 1469 | sdk { |
| 1470 | name: "mysdk", |
| 1471 | java_sdk_libs: ["myjavalib"], |
| 1472 | } |
| 1473 | |
| 1474 | java_sdk_library { |
| 1475 | name: "myjavalib", |
| 1476 | apex_available: ["//apex_available:anyapex"], |
| 1477 | srcs: ["Test.java"], |
| 1478 | sdk_version: "current", |
| 1479 | public: { |
| 1480 | enabled: true, |
| 1481 | }, |
| 1482 | system_server: { |
| 1483 | enabled: true, |
| 1484 | }, |
| 1485 | } |
| 1486 | `) |
| 1487 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 1488 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 1489 | checkAndroidBpContents(` |
Paul Duffin | 0c5bae5 | 2020-06-02 13:00:08 +0100 | [diff] [blame] | 1490 | // This is auto-generated. DO NOT EDIT. |
| 1491 | |
| 1492 | java_sdk_library_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 1493 | name: "myjavalib", |
| 1494 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 1495 | visibility: ["//visibility:public"], |
Paul Duffin | 0c5bae5 | 2020-06-02 13:00:08 +0100 | [diff] [blame] | 1496 | apex_available: ["//apex_available:anyapex"], |
| 1497 | shared_library: true, |
| 1498 | public: { |
| 1499 | jars: ["sdk_library/public/myjavalib-stubs.jar"], |
Paul Duffin | ab5ac8f | 2020-11-18 16:37:35 +0000 | [diff] [blame] | 1500 | stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], |
Paul Duffin | 0c5bae5 | 2020-06-02 13:00:08 +0100 | [diff] [blame] | 1501 | current_api: "sdk_library/public/myjavalib.txt", |
| 1502 | removed_api: "sdk_library/public/myjavalib-removed.txt", |
| 1503 | sdk_version: "current", |
| 1504 | }, |
| 1505 | system_server: { |
| 1506 | jars: ["sdk_library/system-server/myjavalib-stubs.jar"], |
Paul Duffin | ab5ac8f | 2020-11-18 16:37:35 +0000 | [diff] [blame] | 1507 | stub_srcs: ["sdk_library/system-server/myjavalib_stub_sources"], |
Paul Duffin | 0c5bae5 | 2020-06-02 13:00:08 +0100 | [diff] [blame] | 1508 | current_api: "sdk_library/system-server/myjavalib.txt", |
| 1509 | removed_api: "sdk_library/system-server/myjavalib-removed.txt", |
| 1510 | sdk_version: "system_server_current", |
| 1511 | }, |
| 1512 | } |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 1513 | `), |
Paul Duffin | 0c5bae5 | 2020-06-02 13:00:08 +0100 | [diff] [blame] | 1514 | checkAllCopyRules(` |
| 1515 | .intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar |
Colin Cross | cb77f75 | 2021-03-24 12:04:44 -0700 | [diff] [blame] | 1516 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt |
| 1517 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt |
Paul Duffin | 0c5bae5 | 2020-06-02 13:00:08 +0100 | [diff] [blame] | 1518 | .intermediates/myjavalib.stubs.system_server/android_common/javac/myjavalib.stubs.system_server.jar -> sdk_library/system-server/myjavalib-stubs.jar |
Colin Cross | cb77f75 | 2021-03-24 12:04:44 -0700 | [diff] [blame] | 1519 | .intermediates/myjavalib.stubs.source.system_server/android_common/metalava/myjavalib.stubs.source.system_server_api.txt -> sdk_library/system-server/myjavalib.txt |
| 1520 | .intermediates/myjavalib.stubs.source.system_server/android_common/metalava/myjavalib.stubs.source.system_server_removed.txt -> sdk_library/system-server/myjavalib-removed.txt |
Paul Duffin | 0c5bae5 | 2020-06-02 13:00:08 +0100 | [diff] [blame] | 1521 | `), |
| 1522 | checkMergeZips( |
| 1523 | ".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip", |
| 1524 | ".intermediates/mysdk/common_os/tmp/sdk_library/system-server/myjavalib_stub_sources.zip", |
| 1525 | ), |
| 1526 | ) |
| 1527 | } |
| 1528 | |
Paul Duffin | f7a6433 | 2020-05-13 16:54:55 +0100 | [diff] [blame] | 1529 | func TestSnapshotWithJavaSdkLibrary_NamingScheme(t *testing.T) { |
Paul Duffin | 9ec86b1 | 2021-03-15 11:17:52 +0000 | [diff] [blame] | 1530 | result := android.GroupFixturePreparers(prepareForSdkTestWithJavaSdkLibrary).RunTestWithBp(t, ` |
Paul Duffin | f7a6433 | 2020-05-13 16:54:55 +0100 | [diff] [blame] | 1531 | sdk { |
| 1532 | name: "mysdk", |
| 1533 | java_sdk_libs: ["myjavalib"], |
| 1534 | } |
| 1535 | |
| 1536 | java_sdk_library { |
| 1537 | name: "myjavalib", |
| 1538 | apex_available: ["//apex_available:anyapex"], |
| 1539 | srcs: ["Test.java"], |
| 1540 | sdk_version: "current", |
Paul Duffin | ee9ad5d | 2020-09-11 13:04:05 +0100 | [diff] [blame] | 1541 | naming_scheme: "default", |
Paul Duffin | f7a6433 | 2020-05-13 16:54:55 +0100 | [diff] [blame] | 1542 | public: { |
| 1543 | enabled: true, |
| 1544 | }, |
| 1545 | } |
| 1546 | `) |
| 1547 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 1548 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 1549 | checkAndroidBpContents(` |
Paul Duffin | f7a6433 | 2020-05-13 16:54:55 +0100 | [diff] [blame] | 1550 | // This is auto-generated. DO NOT EDIT. |
| 1551 | |
| 1552 | java_sdk_library_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 1553 | name: "myjavalib", |
| 1554 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 1555 | visibility: ["//visibility:public"], |
Paul Duffin | f7a6433 | 2020-05-13 16:54:55 +0100 | [diff] [blame] | 1556 | apex_available: ["//apex_available:anyapex"], |
Paul Duffin | ee9ad5d | 2020-09-11 13:04:05 +0100 | [diff] [blame] | 1557 | naming_scheme: "default", |
Paul Duffin | d7eb1c2 | 2020-05-26 20:57:10 +0100 | [diff] [blame] | 1558 | shared_library: true, |
Paul Duffin | f7a6433 | 2020-05-13 16:54:55 +0100 | [diff] [blame] | 1559 | public: { |
| 1560 | jars: ["sdk_library/public/myjavalib-stubs.jar"], |
Paul Duffin | ab5ac8f | 2020-11-18 16:37:35 +0000 | [diff] [blame] | 1561 | stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], |
Paul Duffin | f7a6433 | 2020-05-13 16:54:55 +0100 | [diff] [blame] | 1562 | current_api: "sdk_library/public/myjavalib.txt", |
| 1563 | removed_api: "sdk_library/public/myjavalib-removed.txt", |
| 1564 | sdk_version: "current", |
| 1565 | }, |
| 1566 | } |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 1567 | `), |
Paul Duffin | f7a6433 | 2020-05-13 16:54:55 +0100 | [diff] [blame] | 1568 | checkAllCopyRules(` |
Paul Duffin | ee9ad5d | 2020-09-11 13:04:05 +0100 | [diff] [blame] | 1569 | .intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar |
Colin Cross | cb77f75 | 2021-03-24 12:04:44 -0700 | [diff] [blame] | 1570 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt |
| 1571 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt |
Paul Duffin | f7a6433 | 2020-05-13 16:54:55 +0100 | [diff] [blame] | 1572 | `), |
| 1573 | checkMergeZips( |
| 1574 | ".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip", |
| 1575 | ), |
| 1576 | ) |
| 1577 | } |
Paul Duffin | a2ae7e0 | 2020-09-11 11:55:00 +0100 | [diff] [blame] | 1578 | |
| 1579 | func TestSnapshotWithJavaSdkLibrary_DoctagFiles(t *testing.T) { |
Paul Duffin | db462dd | 2021-03-21 22:01:55 +0000 | [diff] [blame] | 1580 | result := android.GroupFixturePreparers( |
| 1581 | prepareForSdkTestWithJavaSdkLibrary, |
| 1582 | android.FixtureAddFile("docs/known_doctags", nil), |
| 1583 | ).RunTestWithBp(t, ` |
Paul Duffin | a2ae7e0 | 2020-09-11 11:55:00 +0100 | [diff] [blame] | 1584 | sdk { |
| 1585 | name: "mysdk", |
| 1586 | java_sdk_libs: ["myjavalib"], |
| 1587 | } |
| 1588 | |
| 1589 | java_sdk_library { |
| 1590 | name: "myjavalib", |
| 1591 | srcs: ["Test.java"], |
| 1592 | sdk_version: "current", |
| 1593 | public: { |
| 1594 | enabled: true, |
| 1595 | }, |
| 1596 | doctag_files: ["docs/known_doctags"], |
| 1597 | } |
| 1598 | |
| 1599 | filegroup { |
| 1600 | name: "mygroup", |
| 1601 | srcs: [":myjavalib{.doctags}"], |
| 1602 | } |
| 1603 | `) |
| 1604 | |
Paul Duffin | 36474d3 | 2021-03-12 12:19:43 +0000 | [diff] [blame] | 1605 | CheckSnapshot(t, result, "mysdk", "", |
Paul Duffin | b01ac4b | 2022-05-24 20:10:05 +0000 | [diff] [blame] | 1606 | checkAndroidBpContents(` |
Paul Duffin | a2ae7e0 | 2020-09-11 11:55:00 +0100 | [diff] [blame] | 1607 | // This is auto-generated. DO NOT EDIT. |
| 1608 | |
| 1609 | java_sdk_library_import { |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 1610 | name: "myjavalib", |
| 1611 | prefer: false, |
Paul Duffin | d99d997 | 2020-09-29 16:00:55 +0100 | [diff] [blame] | 1612 | visibility: ["//visibility:public"], |
Martin Stjernholm | 1e04109 | 2020-11-03 00:11:09 +0000 | [diff] [blame] | 1613 | apex_available: ["//apex_available:platform"], |
Paul Duffin | a2ae7e0 | 2020-09-11 11:55:00 +0100 | [diff] [blame] | 1614 | shared_library: true, |
| 1615 | doctag_files: ["doctags/docs/known_doctags"], |
| 1616 | public: { |
| 1617 | jars: ["sdk_library/public/myjavalib-stubs.jar"], |
Paul Duffin | ab5ac8f | 2020-11-18 16:37:35 +0000 | [diff] [blame] | 1618 | stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], |
Paul Duffin | a2ae7e0 | 2020-09-11 11:55:00 +0100 | [diff] [blame] | 1619 | current_api: "sdk_library/public/myjavalib.txt", |
| 1620 | removed_api: "sdk_library/public/myjavalib-removed.txt", |
| 1621 | sdk_version: "current", |
| 1622 | }, |
| 1623 | } |
Paul Duffin | e138188 | 2021-04-16 17:05:10 +0100 | [diff] [blame] | 1624 | `), |
Paul Duffin | a2ae7e0 | 2020-09-11 11:55:00 +0100 | [diff] [blame] | 1625 | checkAllCopyRules(` |
| 1626 | .intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar |
Colin Cross | cb77f75 | 2021-03-24 12:04:44 -0700 | [diff] [blame] | 1627 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt |
| 1628 | .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt |
Paul Duffin | a2ae7e0 | 2020-09-11 11:55:00 +0100 | [diff] [blame] | 1629 | docs/known_doctags -> doctags/docs/known_doctags |
| 1630 | `), |
| 1631 | ) |
| 1632 | } |