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