diff options
| author | 2022-05-04 16:38:28 +0000 | |
|---|---|---|
| committer | 2022-05-04 16:38:28 +0000 | |
| commit | eb89a79400dc49af1847435a68207a8b55b47a1f (patch) | |
| tree | 6ee9354ddbaf33643b2404f4f86d77ee7c970662 /java/app_test.go | |
| parent | 2737d913936c2124c9a57a31ff86052af195d7fe (diff) | |
| parent | b20002cdeb9c7061c04771f74167282c05aeff0d (diff) | |
Merge "Revert "Don't add `uses_libs`/`optional_uses_libs` to the manifest_fixer."" am: be4c7eda08 am: b20002cdeb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2085466
Change-Id: Ibc412099ec92bee26dc33c63f978e0ba14da9b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/app_test.go')
| -rw-r--r-- | java/app_test.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/java/app_test.go b/java/app_test.go index 366142611..85ef95bf5 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -2566,12 +2566,20 @@ func TestUsesLibraries(t *testing.T) { prebuilt := result.ModuleForTests("prebuilt", "android_common") // Test that implicit dependencies on java_sdk_library instances are passed to the manifest. - // This should not include explicit `uses_libs`/`optional_uses_libs` entries. + // These also include explicit `uses_libs`/`optional_uses_libs` entries, as they may be + // propagated from dependencies. actualManifestFixerArgs := app.Output("manifest_fixer/AndroidManifest.xml").Args["args"] expectManifestFixerArgs := `--extract-native-libs=true ` + `--uses-library qux ` + `--uses-library quuz ` + - `--uses-library runtime-library` + `--uses-library foo ` + + `--uses-library com.non.sdk.lib ` + + `--uses-library runtime-library ` + + `--uses-library runtime-required-x ` + + `--uses-library runtime-required-y ` + + `--optional-uses-library bar ` + + `--optional-uses-library runtime-optional-x ` + + `--optional-uses-library runtime-optional-y` android.AssertStringDoesContain(t, "manifest_fixer args", actualManifestFixerArgs, expectManifestFixerArgs) // Test that all libraries are verified (library order matters). |