diff options
author | 2022-04-21 11:13:45 -0400 | |
---|---|---|
committer | 2022-04-21 11:13:45 -0400 | |
commit | 7eed538208b6b158daa39504122545450db6c2e3 (patch) | |
tree | f5bc690bf83621898516df308c0dd5a93960eed7 /sdk/java_sdk_test.go | |
parent | e31a071389c2fdecbe4bb7bf56db94662fbd3a4a (diff) |
Remove unused uses_sdks property for apexes
Test: m nothing & compare build.ninja before/after
Change-Id: I3f1199af338e1d2e48ec29cf9f59b6b36236c4cc
Diffstat (limited to 'sdk/java_sdk_test.go')
-rw-r--r-- | sdk/java_sdk_test.go | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index f0d3b35d7..a99fa1ff0 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -71,90 +71,6 @@ func TestSdkDependsOnSourceEvenWhenPrebuiltPreferred(t *testing.T) { ) } -func TestBasicSdkWithJavaLibrary(t *testing.T) { - result := android.GroupFixturePreparers( - prepareForSdkTestWithJava, - prepareForSdkTestWithApex, - ).RunTestWithBp(t, ` - sdk { - name: "mysdk", - java_header_libs: ["sdkmember"], - } - - sdk_snapshot { - name: "mysdk@1", - java_header_libs: ["sdkmember_mysdk@1"], - } - - sdk_snapshot { - name: "mysdk@2", - java_header_libs: ["sdkmember_mysdk@2"], - } - - java_library { - name: "sdkmember", - srcs: ["Test.java"], - system_modules: "none", - sdk_version: "none", - host_supported: true, - } - - java_import { - name: "sdkmember_mysdk@1", - sdk_member_name: "sdkmember", - host_supported: true, - } - - java_import { - name: "sdkmember_mysdk@2", - sdk_member_name: "sdkmember", - host_supported: true, - } - - java_library { - name: "myjavalib", - srcs: ["Test.java"], - libs: ["sdkmember"], - system_modules: "none", - sdk_version: "none", - compile_dex: true, - host_supported: true, - apex_available: [ - "myapex", - "myapex2", - ], - } - - apex { - name: "myapex", - java_libs: ["myjavalib"], - uses_sdks: ["mysdk@1"], - key: "myapex.key", - certificate: ":myapex.cert", - updatable: false, - } - - apex { - name: "myapex2", - java_libs: ["myjavalib"], - uses_sdks: ["mysdk@2"], - key: "myapex.key", - certificate: ":myapex.cert", - updatable: false, - } - `) - - sdkMemberV1 := result.ModuleForTests("sdkmember_mysdk@1", "android_common").Rule("combineJar").Output - sdkMemberV2 := result.ModuleForTests("sdkmember_mysdk@2", "android_common").Rule("combineJar").Output - - javalibForMyApex := result.ModuleForTests("myjavalib", "android_common_apex10000_mysdk_1") - javalibForMyApex2 := result.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()) - ensureListContains(t, pathsToStrings(javalibForMyApex2.Rule("javac").Implicits), sdkMemberV2.String()) -} - func TestSnapshotWithJavaHeaderLibrary(t *testing.T) { result := android.GroupFixturePreparers( prepareForSdkTestWithJava, |