Revert "Revert^2 "Always embed jni libs and store uncompressed""
This reverts commit 20df11ef2b7a9bd5fd1c62eee5f7dffb9d560df4.
Change-Id: I5645ddb9e0d2c0873916a9192aa3cfbc967fc2cc
diff --git a/java/app_test.go b/java/app_test.go
index 92fe224..a7c48a1 100644
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -2013,8 +2013,8 @@
packaged bool
compressed bool
}{
- {"app", true, false},
- {"app_noembed", true, false},
+ {"app", false, false},
+ {"app_noembed", false, false},
{"app_embed", true, false},
{"test", true, false},
{"test_noembed", true, true},
@@ -3319,7 +3319,8 @@
// 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 := `--uses-library foo ` +
+ expectManifestFixerArgs := `--extract-native-libs=true ` +
+ `--uses-library foo ` +
`--uses-library com.non.sdk.lib ` +
`--uses-library qux ` +
`--uses-library quuz ` +
@@ -4109,7 +4110,7 @@
},
{
name: "aary-no-use-embedded",
- hasPackage: true,
+ hasPackage: false,
},
}