diff options
| author | 2021-08-20 15:39:12 +0100 | |
|---|---|---|
| committer | 2021-08-20 15:54:42 +0100 | |
| commit | 0b1c70efbcbb0c8408f44964923f5b156d025936 (patch) | |
| tree | 572e3e7218e154ca5a0cde5f25598541f171d59c /java/app_test.go | |
| parent | 99d5a0f5c9f2ba5386134b44d44be03ccaf94b35 (diff) | |
Don't add `uses_libs`/`optional_uses_libs` to the manifest_fixer.
These properties specify libraries that cannot be implicitly inferred by
Soong. If these properties are added to Android.bp, this can only be for
the reason that there is a <uses-library> tag in the manifest which is
unknown to the build system. Adding them to the manifest_fixer doesn't
make sense: if they are not in the manifest, they should be removed from
Android.bp as well.
Bug: 132357300
Test: $ lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd
$ adb wait-for-device && adb root && adb logcat \
| grep -E 'ClassLoaderContext [a-z ]+ mismatch'
# empty grep output, no errors
Change-Id: Ic6eb5268a954ef3be7f06a181ec72af99000c547
Diffstat (limited to 'java/app_test.go')
| -rw-r--r-- | java/app_test.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/java/app_test.go b/java/app_test.go index c14c65d18..56ad28d3e 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -2398,14 +2398,7 @@ func TestUsesLibraries(t *testing.T) { expectManifestFixerArgs := `--extract-native-libs=true ` + `--uses-library qux ` + `--uses-library quuz ` + - `--uses-library foo ` + // TODO(b/132357300): "foo" should not be passed to manifest_fixer - `--uses-library com.non.sdk.lib ` + // TODO(b/132357300): "com.non.sdk.lib" should not be passed to manifest_fixer - `--uses-library runtime-library ` + - `--uses-library runtime-required-x ` + // TODO(b/132357300): "runtime-required-x" should not be passed to manifest_fixer - `--uses-library runtime-required-y ` + // TODO(b/132357300): "runtime-required-y" should not be passed to manifest_fixer - `--optional-uses-library bar ` + // TODO(b/132357300): "bar" should not be passed to manifest_fixer - `--optional-uses-library runtime-optional-x ` + // TODO(b/132357300): "runtime-optional-x" should not be passed to manifest_fixer - `--optional-uses-library runtime-optional-y` // TODO(b/132357300): "runtime-optional-y" should not be passed to manifest_fixer + `--uses-library runtime-library` android.AssertStringEquals(t, "manifest_fixer args", expectManifestFixerArgs, actualManifestFixerArgs) // Test that all libraries are verified (library order matters). |