StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor the contruction of the manifest check inputs." into main

Browse Source
This commit is contained in:
Jiakai Zhang
2024-04-12 06:50:15 +00:00
committed by Android (Google) Code Review
parent a1b74a41f0 3ef7283735
commit d2ce58d924
9 changed files with 113 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/app_test.go
View File

@@ -3280,7 +3280,7 @@ func TestUsesLibraries(t *testing.T) {
sdk_version: "current",
optional_uses_libs: [
"bar",
"baz",
"missing-lib-b",
],
}
@@ -3295,7 +3295,7 @@ func TestUsesLibraries(t *testing.T) {
],
optional_uses_libs: [
"bar",
"baz",
"missing-lib-b",
],
}
`
@@ -3317,10 +3317,10 @@ func TestUsesLibraries(t *testing.T) {
// 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 foo ` +
`--uses-library com.non.sdk.lib ` +
`--uses-library qux ` +
`--uses-library quuz ` +
`--uses-library runtime-library ` +
`--uses-library runtime-required-x ` +
`--uses-library runtime-required-y ` +
@@ -3339,9 +3339,9 @@ func TestUsesLibraries(t *testing.T) {
`--uses-library runtime-required-x ` +
`--uses-library runtime-required-y ` +
`--optional-uses-library bar ` +
`--optional-uses-library baz ` +
`--optional-uses-library runtime-optional-x ` +
`--optional-uses-library runtime-optional-y `
`--optional-uses-library runtime-optional-y ` +
`--missing-optional-uses-library missing-lib-b `
android.AssertStringDoesContain(t, "verify cmd args", verifyCmd, verifyArgs)
// Test that all libraries are verified for an APK (library order matters).
@@ -3350,7 +3350,7 @@ func TestUsesLibraries(t *testing.T) {
`--uses-library com.non.sdk.lib ` +
`--uses-library android.test.runner ` +
`--optional-uses-library bar ` +
`--optional-uses-library baz `
`--missing-optional-uses-library missing-lib-b `
android.AssertStringDoesContain(t, "verify apk cmd args", verifyApkCmd, verifyApkArgs)
// Test that necessary args are passed for constructing CLC in Ninja phase.