Remove the java property `exclude_static_libs`
All usages of the property has been converted to using select syntax.
Test: m nothing --no-skip-soong-tests
Bug: 368127911
Change-Id: I130f15d8524b56b6905c4dd3e7283731f437f88d
diff --git a/java/base.go b/java/base.go
index 7c26cc3..32bfc17 100644
--- a/java/base.go
+++ b/java/base.go
@@ -83,9 +83,6 @@
// list of java libraries that will be compiled into the resulting jar
Static_libs proptools.Configurable[[]string] `android:"arch_variant"`
- // list of java libraries that should not be used to build this module
- Exclude_static_libs []string `android:"arch_variant"`
-
// manifest file to be included in resulting jar
Manifest *string `android:"path"`
@@ -827,7 +824,7 @@
}
func (j *Module) staticLibs(ctx android.BaseModuleContext) []string {
- return android.RemoveListFromList(j.properties.Static_libs.GetOrDefault(ctx, nil), j.properties.Exclude_static_libs)
+ return j.properties.Static_libs.GetOrDefault(ctx, nil)
}
func (j *Module) deps(ctx android.BottomUpMutatorContext) {
diff --git a/java/java_test.go b/java/java_test.go
index e976b08..db154ce 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -2454,37 +2454,6 @@
}
}
-func TestJavaExcludeStaticLib(t *testing.T) {
- ctx, _ := testJava(t, `
- java_library {
- name: "bar",
- }
- java_library {
- name: "foo",
- }
- java_library {
- name: "baz",
- static_libs: [
- "foo",
- "bar",
- ],
- exclude_static_libs: [
- "bar",
- ],
- }
- `)
-
- // "bar" not included as dependency of "baz"
- CheckModuleDependencies(t, ctx, "baz", "android_common", []string{
- `core-lambda-stubs`,
- `ext`,
- `foo`,
- `framework`,
- `stable-core-platform-api-stubs-system-modules`,
- `stable.core.platform.api.stubs`,
- })
-}
-
func TestJavaLibraryWithResourcesStem(t *testing.T) {
ctx, _ := testJavaWithFS(t, `
java_library {