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