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