diff options
Diffstat (limited to 'sdk/java_sdk_test.go')
| -rw-r--r-- | sdk/java_sdk_test.go | 337 |
1 files changed, 167 insertions, 170 deletions
diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index 931ca3c56..731e528bf 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -43,6 +43,7 @@ func testSdkWithJava(t *testing.T, bp string) *testSdkResult { "api/system-server-current.txt": nil, "api/system-server-removed.txt": nil, "build/soong/scripts/gen-java-current-api-files.sh": nil, + "docs/known_doctags": nil, } // for java_sdk_library tests @@ -120,17 +121,20 @@ func TestSdkDependsOnSourceEvenWhenPrebuiltPreferred(t *testing.T) { java_import { name: "mysdk_sdkmember@current", sdk_member_name: "sdkmember", + visibility: ["//visibility:public"], jars: ["java/sdkmember.jar"], } java_import { name: "sdkmember", prefer: false, + visibility: ["//visibility:public"], jars: ["java/sdkmember.jar"], } sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_header_libs: ["mysdk_sdkmember@current"], } `)) @@ -207,8 +211,8 @@ func TestBasicSdkWithJavaLibrary(t *testing.T) { sdkMemberV1 := result.ctx.ModuleForTests("sdkmember_mysdk_1", "android_common").Rule("combineJar").Output sdkMemberV2 := result.ctx.ModuleForTests("sdkmember_mysdk_2", "android_common").Rule("combineJar").Output - javalibForMyApex := result.ctx.ModuleForTests("myjavalib", "android_common_myapex") - javalibForMyApex2 := result.ctx.ModuleForTests("myjavalib", "android_common_myapex2") + javalibForMyApex := result.ctx.ModuleForTests("myjavalib", "android_common_apex10000_mysdk_1") + javalibForMyApex2 := result.ctx.ModuleForTests("myjavalib", "android_common_apex10000_mysdk_2") // Depending on the uses_sdks value, different libs are linked ensureListContains(t, pathsToStrings(javalibForMyApex.Rule("javac").Implicits), sdkMemberV1.String()) @@ -242,17 +246,20 @@ func TestSnapshotWithJavaHeaderLibrary(t *testing.T) { java_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], jars: ["java/myjavalib.jar"], } java_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], jars: ["java/myjavalib.jar"], } sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_header_libs: ["mysdk_myjavalib@current"], } @@ -294,6 +301,7 @@ func TestHostSnapshotWithJavaHeaderLibrary(t *testing.T) { java_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/myjavalib.jar"], @@ -302,6 +310,7 @@ java_import { java_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/myjavalib.jar"], @@ -309,6 +318,7 @@ java_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, java_header_libs: ["mysdk_myjavalib@current"], @@ -346,6 +356,7 @@ func TestDeviceAndHostSnapshotWithJavaHeaderLibrary(t *testing.T) { java_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], host_supported: true, target: { android: { @@ -360,6 +371,7 @@ java_import { java_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], host_supported: true, target: { android: { @@ -373,6 +385,7 @@ java_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], host_supported: true, java_header_libs: ["mysdk_myjavalib@current"], } @@ -412,17 +425,20 @@ func TestSnapshotWithJavaImplLibrary(t *testing.T) { java_import { name: "myexports_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], jars: ["java/myjavalib.jar"], } java_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], jars: ["java/myjavalib.jar"], } module_exports_snapshot { name: "myexports@current", + visibility: ["//visibility:public"], java_libs: ["myexports_myjavalib@current"], } @@ -464,6 +480,7 @@ func TestHostSnapshotWithJavaImplLibrary(t *testing.T) { java_import { name: "myexports_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/myjavalib.jar"], @@ -472,6 +489,7 @@ java_import { java_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/myjavalib.jar"], @@ -479,6 +497,7 @@ java_import { module_exports_snapshot { name: "myexports@current", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, java_libs: ["myexports_myjavalib@current"], @@ -515,6 +534,7 @@ func TestSnapshotWithJavaTest(t *testing.T) { java_test_import { name: "myexports_myjavatests@current", sdk_member_name: "myjavatests", + visibility: ["//visibility:public"], jars: ["java/myjavatests.jar"], test_config: "java/myjavatests-AndroidTest.xml", } @@ -522,12 +542,14 @@ java_test_import { java_test_import { name: "myjavatests", prefer: false, + visibility: ["//visibility:public"], jars: ["java/myjavatests.jar"], test_config: "java/myjavatests-AndroidTest.xml", } module_exports_snapshot { name: "myexports@current", + visibility: ["//visibility:public"], java_tests: ["myexports_myjavatests@current"], } `), @@ -565,6 +587,7 @@ func TestHostSnapshotWithJavaTest(t *testing.T) { java_test_import { name: "myexports_myjavatests@current", sdk_member_name: "myjavatests", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/myjavatests.jar"], @@ -574,6 +597,7 @@ java_test_import { java_test_import { name: "myjavatests", prefer: false, + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/myjavatests.jar"], @@ -582,6 +606,7 @@ java_test_import { module_exports_snapshot { name: "myexports@current", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, java_tests: ["myexports_myjavatests@current"], @@ -594,142 +619,6 @@ module_exports_snapshot { ) } -func testSdkWithDroidstubs(t *testing.T, bp string) *testSdkResult { - t.Helper() - - fs := map[string][]byte{ - "foo/bar/Foo.java": nil, - "stubs-sources/foo/bar/Foo.java": nil, - } - return testSdkWithFs(t, bp, fs) -} - -// Note: This test does not verify that a droidstubs can be referenced, either -// directly or indirectly from an APEX as droidstubs can never be a part of an -// apex. -func TestBasicSdkWithDroidstubs(t *testing.T) { - testSdkWithDroidstubs(t, ` - sdk { - name: "mysdk", - stubs_sources: ["mystub"], - } - sdk_snapshot { - name: "mysdk@10", - stubs_sources: ["mystub_mysdk@10"], - } - prebuilt_stubs_sources { - name: "mystub_mysdk@10", - sdk_member_name: "mystub", - srcs: ["stubs-sources/foo/bar/Foo.java"], - } - droidstubs { - name: "mystub", - srcs: ["foo/bar/Foo.java"], - sdk_version: "none", - system_modules: "none", - } - java_library { - name: "myjavalib", - srcs: [":mystub"], - sdk_version: "none", - system_modules: "none", - } - `) -} - -func TestSnapshotWithDroidstubs(t *testing.T) { - result := testSdkWithDroidstubs(t, ` - module_exports { - name: "myexports", - stubs_sources: ["myjavaapistubs"], - } - - droidstubs { - name: "myjavaapistubs", - srcs: ["foo/bar/Foo.java"], - system_modules: "none", - sdk_version: "none", - } - `) - - result.CheckSnapshot("myexports", "", - checkAndroidBpContents(` -// This is auto-generated. DO NOT EDIT. - -prebuilt_stubs_sources { - name: "myexports_myjavaapistubs@current", - sdk_member_name: "myjavaapistubs", - srcs: ["java/myjavaapistubs_stubs_sources"], -} - -prebuilt_stubs_sources { - name: "myjavaapistubs", - prefer: false, - srcs: ["java/myjavaapistubs_stubs_sources"], -} - -module_exports_snapshot { - name: "myexports@current", - stubs_sources: ["myexports_myjavaapistubs@current"], -} - -`), - checkAllCopyRules(""), - checkMergeZips(".intermediates/myexports/common_os/tmp/java/myjavaapistubs_stubs_sources.zip"), - ) -} - -func TestHostSnapshotWithDroidstubs(t *testing.T) { - result := testSdkWithDroidstubs(t, ` - module_exports { - name: "myexports", - device_supported: false, - host_supported: true, - stubs_sources: ["myjavaapistubs"], - } - - droidstubs { - name: "myjavaapistubs", - device_supported: false, - host_supported: true, - srcs: ["foo/bar/Foo.java"], - system_modules: "none", - sdk_version: "none", - } - `) - - result.CheckSnapshot("myexports", "", - checkAndroidBpContents(` -// This is auto-generated. DO NOT EDIT. - -prebuilt_stubs_sources { - name: "myexports_myjavaapistubs@current", - sdk_member_name: "myjavaapistubs", - device_supported: false, - host_supported: true, - srcs: ["java/myjavaapistubs_stubs_sources"], -} - -prebuilt_stubs_sources { - name: "myjavaapistubs", - prefer: false, - device_supported: false, - host_supported: true, - srcs: ["java/myjavaapistubs_stubs_sources"], -} - -module_exports_snapshot { - name: "myexports@current", - device_supported: false, - host_supported: true, - stubs_sources: ["myexports_myjavaapistubs@current"], -} -`), - checkAllCopyRules(""), - checkMergeZips(".intermediates/myexports/common_os/tmp/java/myjavaapistubs_stubs_sources.zip"), - ) -} - func TestSnapshotWithJavaSystemModules(t *testing.T) { result := testSdkWithJava(t, ` sdk { @@ -765,12 +654,14 @@ func TestSnapshotWithJavaSystemModules(t *testing.T) { java_import { name: "mysdk_exported-system-module@current", sdk_member_name: "exported-system-module", + visibility: ["//visibility:public"], jars: ["java/exported-system-module.jar"], } java_import { name: "exported-system-module", prefer: false, + visibility: ["//visibility:public"], jars: ["java/exported-system-module.jar"], } @@ -791,6 +682,7 @@ java_import { java_system_modules_import { name: "mysdk_my-system-modules@current", sdk_member_name: "my-system-modules", + visibility: ["//visibility:public"], libs: [ "mysdk_system-module@current", "mysdk_exported-system-module@current", @@ -800,6 +692,7 @@ java_system_modules_import { java_system_modules_import { name: "my-system-modules", prefer: false, + visibility: ["//visibility:public"], libs: [ "mysdk_system-module", "exported-system-module", @@ -808,6 +701,7 @@ java_system_modules_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_header_libs: ["mysdk_exported-system-module@current"], java_system_modules: ["mysdk_my-system-modules@current"], } @@ -870,6 +764,7 @@ java_import { java_system_modules_import { name: "mysdk_my-system-modules@current", sdk_member_name: "my-system-modules", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, libs: ["mysdk_system-module@current"], @@ -878,6 +773,7 @@ java_system_modules_import { java_system_modules_import { name: "my-system-modules", prefer: false, + visibility: ["//visibility:public"], device_supported: false, host_supported: true, libs: ["mysdk_system-module"], @@ -885,6 +781,7 @@ java_system_modules_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, java_system_modules: ["mysdk_my-system-modules@current"], @@ -938,6 +835,7 @@ func TestDeviceAndHostSnapshotWithOsSpecificMembers(t *testing.T) { java_import { name: "myexports_hostjavalib@current", sdk_member_name: "hostjavalib", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/hostjavalib.jar"], @@ -946,6 +844,7 @@ java_import { java_import { name: "hostjavalib", prefer: false, + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/hostjavalib.jar"], @@ -954,18 +853,21 @@ java_import { java_import { name: "myexports_androidjavalib@current", sdk_member_name: "androidjavalib", + visibility: ["//visibility:public"], jars: ["java/androidjavalib.jar"], } java_import { name: "androidjavalib", prefer: false, + visibility: ["//visibility:public"], jars: ["java/androidjavalib.jar"], } java_import { name: "myexports_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], host_supported: true, target: { android: { @@ -980,6 +882,7 @@ java_import { java_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], host_supported: true, target: { android: { @@ -993,6 +896,7 @@ java_import { module_exports_snapshot { name: "myexports@current", + visibility: ["//visibility:public"], host_supported: true, java_libs: ["myexports_myjavalib@current"], target: { @@ -1039,25 +943,26 @@ func TestSnapshotWithJavaSdkLibrary(t *testing.T) { java_sdk_library_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: false, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/public/myjavalib.txt", removed_api: "sdk_library/public/myjavalib-removed.txt", sdk_version: "current", }, system: { jars: ["sdk_library/system/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/system/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/system/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/system/myjavalib.txt", removed_api: "sdk_library/system/myjavalib-removed.txt", sdk_version: "system_current", }, test: { jars: ["sdk_library/test/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/test/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/test/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/test/myjavalib.txt", removed_api: "sdk_library/test/myjavalib-removed.txt", sdk_version: "test_current", @@ -1067,25 +972,26 @@ java_sdk_library_import { java_sdk_library_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: false, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/public/myjavalib.txt", removed_api: "sdk_library/public/myjavalib-removed.txt", sdk_version: "current", }, system: { jars: ["sdk_library/system/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/system/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/system/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/system/myjavalib.txt", removed_api: "sdk_library/system/myjavalib-removed.txt", sdk_version: "system_current", }, test: { jars: ["sdk_library/test/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/test/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/test/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/test/myjavalib.txt", removed_api: "sdk_library/test/myjavalib-removed.txt", sdk_version: "test_current", @@ -1094,6 +1000,7 @@ java_sdk_library_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_sdk_libs: ["mysdk_myjavalib@current"], } `), @@ -1137,10 +1044,11 @@ func TestSnapshotWithJavaSdkLibrary_SdkVersion_None(t *testing.T) { java_sdk_library_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/public/myjavalib.txt", removed_api: "sdk_library/public/myjavalib-removed.txt", sdk_version: "none", @@ -1150,10 +1058,11 @@ java_sdk_library_import { java_sdk_library_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/public/myjavalib.txt", removed_api: "sdk_library/public/myjavalib-removed.txt", sdk_version: "none", @@ -1162,6 +1071,7 @@ java_sdk_library_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_sdk_libs: ["mysdk_myjavalib@current"], } `), @@ -1201,10 +1111,11 @@ func TestSnapshotWithJavaSdkLibrary_SdkVersion_ForScope(t *testing.T) { java_sdk_library_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/public/myjavalib.txt", removed_api: "sdk_library/public/myjavalib-removed.txt", sdk_version: "module_current", @@ -1214,10 +1125,11 @@ java_sdk_library_import { java_sdk_library_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/public/myjavalib.txt", removed_api: "sdk_library/public/myjavalib-removed.txt", sdk_version: "module_current", @@ -1226,6 +1138,7 @@ java_sdk_library_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_sdk_libs: ["mysdk_myjavalib@current"], } `), @@ -1268,18 +1181,19 @@ func TestSnapshotWithJavaSdkLibrary_ApiScopes(t *testing.T) { java_sdk_library_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/public/myjavalib.txt", removed_api: "sdk_library/public/myjavalib-removed.txt", sdk_version: "current", }, system: { jars: ["sdk_library/system/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/system/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/system/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/system/myjavalib.txt", removed_api: "sdk_library/system/myjavalib-removed.txt", sdk_version: "system_current", @@ -1289,18 +1203,19 @@ java_sdk_library_import { java_sdk_library_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/public/myjavalib.txt", removed_api: "sdk_library/public/myjavalib-removed.txt", sdk_version: "current", }, system: { jars: ["sdk_library/system/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/system/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/system/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/system/myjavalib.txt", removed_api: "sdk_library/system/myjavalib-removed.txt", sdk_version: "system_current", @@ -1309,6 +1224,7 @@ java_sdk_library_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_sdk_libs: ["mysdk_myjavalib@current"], } `), @@ -1358,25 +1274,26 @@ func TestSnapshotWithJavaSdkLibrary_ModuleLib(t *testing.T) { java_sdk_library_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/public/myjavalib.txt", removed_api: "sdk_library/public/myjavalib-removed.txt", sdk_version: "current", }, system: { jars: ["sdk_library/system/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/system/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/system/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/system/myjavalib.txt", removed_api: "sdk_library/system/myjavalib-removed.txt", sdk_version: "system_current", }, module_lib: { jars: ["sdk_library/module-lib/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/module-lib/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/module-lib/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/module-lib/myjavalib.txt", removed_api: "sdk_library/module-lib/myjavalib-removed.txt", sdk_version: "module_current", @@ -1386,25 +1303,26 @@ java_sdk_library_import { java_sdk_library_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/public/myjavalib.txt", removed_api: "sdk_library/public/myjavalib-removed.txt", sdk_version: "current", }, system: { jars: ["sdk_library/system/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/system/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/system/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/system/myjavalib.txt", removed_api: "sdk_library/system/myjavalib-removed.txt", sdk_version: "system_current", }, module_lib: { jars: ["sdk_library/module-lib/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/module-lib/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/module-lib/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/module-lib/myjavalib.txt", removed_api: "sdk_library/module-lib/myjavalib-removed.txt", sdk_version: "module_current", @@ -1413,6 +1331,7 @@ java_sdk_library_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_sdk_libs: ["mysdk_myjavalib@current"], } `), @@ -1463,18 +1382,19 @@ func TestSnapshotWithJavaSdkLibrary_SystemServer(t *testing.T) { java_sdk_library_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/public/myjavalib.txt", removed_api: "sdk_library/public/myjavalib-removed.txt", sdk_version: "current", }, system_server: { jars: ["sdk_library/system-server/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/system-server/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/system-server/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/system-server/myjavalib.txt", removed_api: "sdk_library/system-server/myjavalib-removed.txt", sdk_version: "system_server_current", @@ -1484,18 +1404,19 @@ java_sdk_library_import { java_sdk_library_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/public/myjavalib.txt", removed_api: "sdk_library/public/myjavalib-removed.txt", sdk_version: "current", }, system_server: { jars: ["sdk_library/system-server/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/system-server/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/system-server/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/system-server/myjavalib.txt", removed_api: "sdk_library/system-server/myjavalib-removed.txt", sdk_version: "system_server_current", @@ -1504,6 +1425,7 @@ java_sdk_library_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_sdk_libs: ["mysdk_myjavalib@current"], } `), @@ -1534,7 +1456,7 @@ func TestSnapshotWithJavaSdkLibrary_NamingScheme(t *testing.T) { apex_available: ["//apex_available:anyapex"], srcs: ["Test.java"], sdk_version: "current", - naming_scheme: "framework-modules", + naming_scheme: "default", public: { enabled: true, }, @@ -1548,12 +1470,13 @@ func TestSnapshotWithJavaSdkLibrary_NamingScheme(t *testing.T) { java_sdk_library_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], - naming_scheme: "framework-modules", + naming_scheme: "default", shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/public/myjavalib.txt", removed_api: "sdk_library/public/myjavalib-removed.txt", sdk_version: "current", @@ -1563,12 +1486,13 @@ java_sdk_library_import { java_sdk_library_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], - naming_scheme: "framework-modules", + naming_scheme: "default", shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], current_api: "sdk_library/public/myjavalib.txt", removed_api: "sdk_library/public/myjavalib-removed.txt", sdk_version: "current", @@ -1577,16 +1501,89 @@ java_sdk_library_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_sdk_libs: ["mysdk_myjavalib@current"], } `), checkAllCopyRules(` -.intermediates/myjavalib-stubs-publicapi/android_common/javac/myjavalib-stubs-publicapi.jar -> sdk_library/public/myjavalib-stubs.jar -.intermediates/myjavalib-stubs-srcs-publicapi/android_common/myjavalib-stubs-srcs-publicapi_api.txt -> sdk_library/public/myjavalib.txt -.intermediates/myjavalib-stubs-srcs-publicapi/android_common/myjavalib-stubs-srcs-publicapi_removed.txt -> sdk_library/public/myjavalib-removed.txt +.intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar +.intermediates/myjavalib.stubs.source/android_common/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt +.intermediates/myjavalib.stubs.source/android_common/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt `), checkMergeZips( ".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip", ), ) } + +func TestSnapshotWithJavaSdkLibrary_DoctagFiles(t *testing.T) { + result := testSdkWithJava(t, ` + sdk { + name: "mysdk", + java_sdk_libs: ["myjavalib"], + } + + java_sdk_library { + name: "myjavalib", + srcs: ["Test.java"], + sdk_version: "current", + public: { + enabled: true, + }, + doctag_files: ["docs/known_doctags"], + } + + filegroup { + name: "mygroup", + srcs: [":myjavalib{.doctags}"], + } + `) + + result.CheckSnapshot("mysdk", "", + checkAndroidBpContents(` +// This is auto-generated. DO NOT EDIT. + +java_sdk_library_import { + name: "mysdk_myjavalib@current", + sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], + shared_library: true, + doctag_files: ["doctags/docs/known_doctags"], + public: { + jars: ["sdk_library/public/myjavalib-stubs.jar"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], + current_api: "sdk_library/public/myjavalib.txt", + removed_api: "sdk_library/public/myjavalib-removed.txt", + sdk_version: "current", + }, +} + +java_sdk_library_import { + name: "myjavalib", + prefer: false, + visibility: ["//visibility:public"], + shared_library: true, + doctag_files: ["doctags/docs/known_doctags"], + public: { + jars: ["sdk_library/public/myjavalib-stubs.jar"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources/**/*.java"], + current_api: "sdk_library/public/myjavalib.txt", + removed_api: "sdk_library/public/myjavalib-removed.txt", + sdk_version: "current", + }, +} + +sdk_snapshot { + name: "mysdk@current", + visibility: ["//visibility:public"], + java_sdk_libs: ["mysdk_myjavalib@current"], +} +`), + checkAllCopyRules(` +.intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar +.intermediates/myjavalib.stubs.source/android_common/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt +.intermediates/myjavalib.stubs.source/android_common/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt +docs/known_doctags -> doctags/docs/known_doctags +`), + ) +} |