diff options
| author | 2020-08-19 14:58:01 +0100 | |
|---|---|---|
| committer | 2020-08-20 12:34:42 +0100 | |
| commit | 4b6d4c12cc9d4156705bdba2b17eb4ce990fe389 (patch) | |
| tree | 01fcb4f59452a51425dda0f42d5658cb7e49f4bf /java/app_test.go | |
| parent | 9ce22217915c9fa3da6a23634e83f24705417cd1 (diff) | |
Propagate transitive <uses-library> dependencies through static libraries.
Bug: 163037089
Test: lunch aosp_cf_x86-userdebug && m nothing
Test: added testcase in Soong
Change-Id: I943d497d779ca218a16e7208029189a1a69086c1
Diffstat (limited to 'java/app_test.go')
| -rw-r--r-- | java/app_test.go | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/java/app_test.go b/java/app_test.go index a070318db..6b27124e4 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -2526,10 +2526,24 @@ func TestUsesLibraries(t *testing.T) { sdk_version: "current", } + java_sdk_library { + name: "runtime-library", + srcs: ["a.java"], + sdk_version: "current", + } + + java_library { + name: "static-runtime-helper", + srcs: ["a.java"], + libs: ["runtime-library"], + sdk_version: "current", + } + android_app { name: "app", srcs: ["a.java"], libs: ["qux", "quuz.stubs"], + static_libs: ["static-runtime-helper"], uses_libs: ["foo"], sdk_version: "current", optional_uses_libs: [ @@ -2562,11 +2576,10 @@ func TestUsesLibraries(t *testing.T) { // Test that implicit dependencies on java_sdk_library instances are passed to the manifest. manifestFixerArgs := app.Output("manifest_fixer/AndroidManifest.xml").Args["args"] - if w := "--uses-library qux"; !strings.Contains(manifestFixerArgs, w) { - t.Errorf("unexpected manifest_fixer args: wanted %q in %q", w, manifestFixerArgs) - } - if w := "--uses-library quuz"; !strings.Contains(manifestFixerArgs, w) { - t.Errorf("unexpected manifest_fixer args: wanted %q in %q", w, manifestFixerArgs) + for _, w := range []string{"qux", "quuz", "runtime-library"} { + if !strings.Contains(manifestFixerArgs, "--uses-library "+w) { + t.Errorf("unexpected manifest_fixer args: wanted %q in %q", w, manifestFixerArgs) + } } // Test that all libraries are verified |