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

Revert "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules."

Browse Source 
This reverts commit 21f7ae0828.

Reason for revert: b/213966211

Change-Id: I697739697221d6f821eeda33a434cfcae9d651bf
This commit is contained in:
Josh Wu
2022-01-11 05:12:15 +00:00
parent 21f7ae0828
commit 3964ce02ff
2 changed files with 16 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/sdk_library_test.go
View File

@@ -48,7 +48,6 @@ func TestJavaSdkLibrary(t *testing.T) {
name: "bar",
srcs: ["a.java", "b.java"],
api_packages: ["bar"],
exclude_kotlinc_generated_files: false,
}
java_library {
name: "baz",
@@ -162,14 +161,6 @@ func TestJavaSdkLibrary(t *testing.T) {
android.AssertDeepEquals(t, "qux exports (required)", []string{"fred", "quuz", "foo", "bar"}, requiredSdkLibs)
android.AssertDeepEquals(t, "qux exports (optional)", []string{}, optionalSdkLibs)
}
fooDexJar := result.ModuleForTests("foo", "android_common").Rule("d8")
// tests if kotlinc generated files are excluded from output of foo.
android.AssertStringDoesContain(t, "foo dex", fooDexJar.BuildParams.Args["mergeZipsFlags"], "-stripFile META-INF/*.kotlin_module")
barDexJar := result.ModuleForTests("bar", "android_common").Rule("d8")
// tests if kotlinc generated files are NOT excluded from output of bar.
android.AssertStringDoesNotContain(t, "bar dex", barDexJar.BuildParams.Args["mergeZipsFlags"], "-stripFile META-INF/*.kotlin_module")
}
func TestJavaSdkLibrary_UpdatableLibrary(t *testing.T) {