StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup remaining android.JavaApiLibraryName() references

Browse Source 
Since the name of the java_library generated from sdk_library per api
scope does not depend on the build configuration anymore, all
dependency switching "magic" via android.JavaApiLibraryName() can be
removed.

This change also removes from-text-build-specific test cases, as those
test cases depend on build configurations.

Test: m nothing && m nothing --build-from-text-stub
Bug: 287340610
Change-Id: I3bac35259e0cbaa16432a46cb2b128951c9bc075
This commit is contained in:
Jihoon Kang
2023-06-14 22:43:25 +00:00
parent 3d4d88d68e
commit 6c0df88809
8 changed files with 10 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
java/bootclasspath_fragment_test.go
View File

@@ -432,39 +432,3 @@ func TestBootclasspathFragment_Test(t *testing.T) {
fragment = result.Module("a_test_fragment", "android_common").(*BootclasspathFragmentModule)
android.AssertBoolEquals(t, "is a test fragment by type", true, fragment.isTestFragment())
}
func TestBootclassFragment_LinkTextStub(t *testing.T) {
result := android.GroupFixturePreparers(
prepareForJavaTest,
prepareForTestWithBootclasspathFragment,
PrepareForTestWithJavaSdkLibraryFiles,
FixtureWithLastReleaseApis("mysdklibrary"),
android.FixtureModifyConfig(func(config android.Config) {
config.SetBuildFromTextStub(true)
}),
).RunTestWithBp(t, `
bootclasspath_fragment {
name: "myfragment",
contents: ["mysdklibrary"],
hidden_api: {split_packages: ["*"]},
additional_stubs: [
"android-non-updatable",
],
}
java_sdk_library {
name: "mysdklibrary",
srcs: ["a.java"],
shared_library: false,
public: {enabled: true},
system: {enabled: true},
}
`)
fragment := result.ModuleForTests("myfragment", "android_common")
ruleCommand := fragment.Rule("modularHiddenAPIStubFlagsFile").RuleParams.Command
android.AssertStringDoesContain(t, "Command expected to contain library as dependency stub dex",
ruleCommand, "--dependency-stub-dex=out/soong/.intermediates/default/java/android-non-updatable.stubs.module_lib.from-text/android_common/dex/android-non-updatable.stubs.module_lib.from-text.jar")
android.AssertStringDoesNotContain(t,
"Command not expected to contain multiple api_library as dependency stub dex", ruleCommand,
"--dependency-stub-dex=out/soong/.intermediates/default/java/android-non-updatable.stubs.from-text/android_common/dex/android-non-updatable.stubs.from-text.jar")
}