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