summaryrefslogtreecommitdiff
path: root/java/app_test.go
diff options
context:
space:
mode:
author Ulyana Trafimovich <skvadrik@google.com> 2021-08-24 10:57:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-24 10:57:09 +0000
commit0887de0b21d93a2cf487032c88836767f1589985 (patch)
treec0552f0d259ca8f66b91bf64fcec1054896b10a8 /java/app_test.go
parentb701cb2ec29b2c4984f942808a42b5a79add0c22 (diff)
parent628884193c365805677ca62b3fc38d01b89583ff (diff)
Merge "Don't add `uses_libs`/`optional_uses_libs` to the manifest_fixer." am: 81a1adb6db am: affc7d8116 am: 4870f2b0cb am: ade9fe9d53 am: 628884193c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1803744 Change-Id: Id0d1b326a41cc7873aafe43351c3131e0f3f9d7d
Diffstat (limited to 'java/app_test.go')
-rw-r--r--java/app_test.go9
1 files changed, 1 insertions, 8 deletions
diff --git a/java/app_test.go b/java/app_test.go
index f4fdfa756..07439fcd0 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).