Merge "Revert "Enable from-text stub generation in non-sdk java_sdk_library"" into main am: f6d9965cc5
am: ad5e953a7d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3207397 Change-Id: I411dc190da40073de7d794de9ad7ef8fd5da9ed3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -10015,6 +10015,9 @@ func TestApexLintBcpFragmentSdkLibDeps(t *testing.T) {
|
||||
java.PrepareForTestWithJavaSdkLibraryFiles,
|
||||
java.PrepareForTestWithJacocoInstrumentation,
|
||||
java.FixtureWithLastReleaseApis("foo"),
|
||||
android.FixtureModifyConfig(func(config android.Config) {
|
||||
config.SetApiLibraries([]string{"foo"})
|
||||
}),
|
||||
android.FixtureMergeMockFs(fs),
|
||||
).RunTestWithBp(t, bp)
|
||||
|
||||
@@ -11486,6 +11489,9 @@ func TestAconfifDeclarationsValidation(t *testing.T) {
|
||||
prepareForApexTest,
|
||||
java.PrepareForTestWithJavaSdkLibraryFiles,
|
||||
java.FixtureWithLastReleaseApis("foo"),
|
||||
android.FixtureModifyConfig(func(config android.Config) {
|
||||
config.SetApiLibraries([]string{"foo"})
|
||||
}),
|
||||
).RunTestWithBp(t, `
|
||||
java_library {
|
||||
name: "baz-java-lib",
|
||||
|
Reference in New Issue
Block a user