Drop INTERNAL_PLATFORM_MISSING_USES_LIBRARIES.
Bug: 282877248
Test: Presubmit build tests.
Change-Id: Idd69433f308f5f47973ff0d5340a2399a27cb32c
diff --git a/android/config.go b/android/config.go
index bed57e3..14fc04d 100644
--- a/android/config.go
+++ b/android/config.go
@@ -1710,10 +1710,6 @@
return c.productVariables.ProductPrivateSepolicyDirs
}
-func (c *config) MissingUsesLibraries() []string {
- return c.productVariables.MissingUsesLibraries
-}
-
func (c *config) TargetMultitreeUpdateMeta() bool {
return c.productVariables.MultitreeUpdateMeta
}
diff --git a/android/variable.go b/android/variable.go
index 77888e5..972663b 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -420,8 +420,6 @@
TargetFSConfigGen []string `json:",omitempty"`
- MissingUsesLibraries []string `json:",omitempty"`
-
EnforceProductPartitionInterface *bool `json:",omitempty"`
EnforceInterPartitionJavaSdkLibrary *bool `json:",omitempty"`
diff --git a/java/app.go b/java/app.go
index 561ce1d..cdec1e1 100755
--- a/java/app.go
+++ b/java/app.go
@@ -18,6 +18,7 @@
// related module types, including their override variants.
import (
+ "fmt"
"path/filepath"
"strings"
@@ -1390,10 +1391,15 @@
}
}
-// presentOptionalUsesLibs returns optional_uses_libs after filtering out MissingUsesLibraries, which don't exist in the
-// build.
+// presentOptionalUsesLibs returns optional_uses_libs after filtering out libraries that don't exist in the source tree.
func (u *usesLibrary) presentOptionalUsesLibs(ctx android.BaseModuleContext) []string {
- optionalUsesLibs, _ := android.FilterList(u.usesLibraryProperties.Optional_uses_libs, ctx.Config().MissingUsesLibraries())
+ optionalUsesLibs := android.FilterListPred(u.usesLibraryProperties.Optional_uses_libs, func(s string) bool {
+ exists := ctx.OtherModuleExists(s)
+ if !exists {
+ fmt.Printf("Warning: Module '%s' depends on non-existing optional_uses_libs '%s'\n", ctx.ModuleName(), s)
+ }
+ return exists
+ })
return optionalUsesLibs
}
diff --git a/java/app_test.go b/java/app_test.go
index 7f9f0ed..592859c 100644
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -2644,9 +2644,6 @@
prepareForJavaTest,
PrepareForTestWithJavaSdkLibraryFiles,
FixtureWithLastReleaseApis("runtime-library", "foo", "quuz", "qux", "bar", "fred"),
- android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
- variables.MissingUsesLibraries = []string{"baz"}
- }),
).RunTestWithBp(t, bp)
app := result.ModuleForTests("app", "android_common")