diff options
author | 2023-06-02 14:59:10 +0000 | |
---|---|---|
committer | 2023-06-02 14:59:10 +0000 | |
commit | f508c252bb0bba6df49ceca5dbde28e9aa48cac1 (patch) | |
tree | 18360321b27c8171b0d9fdc6a48184c72d28ce40 /java | |
parent | b25cbb3449fe589281f04ba9132986aa9bbe3a44 (diff) | |
parent | 4f65a03d30a4f89ca3eeca70ada21cd79c43b220 (diff) |
Merge "Drop INTERNAL_PLATFORM_MISSING_USES_LIBRARIES."
Diffstat (limited to 'java')
-rwxr-xr-x | java/app.go | 12 | ||||
-rw-r--r-- | java/app_test.go | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/java/app.go b/java/app.go index d99c1843d..58580d420 100755 --- a/java/app.go +++ b/java/app.go @@ -18,6 +18,7 @@ package java // related module types, including their override variants. import ( + "fmt" "path/filepath" "strings" @@ -1391,10 +1392,15 @@ func (u *usesLibrary) deps(ctx android.BottomUpMutatorContext, addCompatDeps boo } } -// 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 68e9d11f7..5aed17876 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -2644,9 +2644,6 @@ func TestUsesLibraries(t *testing.T) { 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") |