Merge "ensure that privapp_allowlist is installed before android_app"
This commit is contained in:
11
java/app.go
11
java/app.go
@@ -613,7 +613,6 @@ func processMainCert(m android.ModuleBase, certPropValue string, certificates []
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return mainCertificate, certificates
|
||||
}
|
||||
|
||||
@@ -795,17 +794,17 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
// Install the app package.
|
||||
shouldInstallAppPackage := (Bool(a.Module.properties.Installable) || ctx.Host()) && apexInfo.IsForPlatform() && !a.appProperties.PreventInstall
|
||||
if shouldInstallAppPackage {
|
||||
if a.privAppAllowlist.Valid() {
|
||||
installPath := android.PathForModuleInstall(ctx, "etc", "permissions")
|
||||
ctx.InstallFile(installPath, a.privAppAllowlist.Path().Base(), a.privAppAllowlist.Path())
|
||||
}
|
||||
|
||||
var extraInstalledPaths android.Paths
|
||||
for _, extra := range a.extraOutputFiles {
|
||||
installed := ctx.InstallFile(a.installDir, extra.Base(), extra)
|
||||
extraInstalledPaths = append(extraInstalledPaths, installed)
|
||||
}
|
||||
ctx.InstallFile(a.installDir, a.outputFile.Base(), a.outputFile, extraInstalledPaths...)
|
||||
|
||||
if a.privAppAllowlist.Valid() {
|
||||
installPath := android.PathForModuleInstall(ctx, "etc", "permissions")
|
||||
ctx.InstallFile(installPath, a.privAppAllowlist.Path().Base(), a.privAppAllowlist.Path())
|
||||
}
|
||||
}
|
||||
|
||||
a.buildAppDependencyInfo(ctx)
|
||||
|
@@ -3589,3 +3589,82 @@ func TestPrivappAllowlist(t *testing.T) {
|
||||
app.Output("out/soong/target/product/test_device/system/etc/permissions/privapp_allowlist_com.android.foo.xml")
|
||||
overrideApp.Output("out/soong/target/product/test_device/system/etc/permissions/privapp_allowlist_com.google.android.foo.xml")
|
||||
}
|
||||
|
||||
func TestPrivappAllowlistAndroidMk(t *testing.T) {
|
||||
result := android.GroupFixturePreparers(
|
||||
PrepareForTestWithJavaDefaultModules,
|
||||
android.PrepareForTestWithAndroidMk,
|
||||
).RunTestWithBp(
|
||||
t,
|
||||
`
|
||||
android_app {
|
||||
name: "foo",
|
||||
srcs: ["a.java"],
|
||||
privapp_allowlist: "privapp_allowlist_com.android.foo.xml",
|
||||
privileged: true,
|
||||
sdk_version: "current",
|
||||
}
|
||||
override_android_app {
|
||||
name: "bar",
|
||||
base: "foo",
|
||||
package_name: "com.google.android.foo",
|
||||
}
|
||||
`,
|
||||
)
|
||||
baseApp := result.ModuleForTests("foo", "android_common")
|
||||
overrideApp := result.ModuleForTests("foo", "android_common_bar")
|
||||
|
||||
baseAndroidApp := baseApp.Module().(*AndroidApp)
|
||||
baseEntries := android.AndroidMkEntriesForTest(t, result.TestContext, baseAndroidApp)[0]
|
||||
android.AssertStringMatches(
|
||||
t,
|
||||
"androidmk has incorrect LOCAL_SOONG_INSTALLED_MODULE; expected to find foo.apk",
|
||||
baseEntries.EntryMap["LOCAL_SOONG_INSTALLED_MODULE"][0],
|
||||
"\\S+foo.apk",
|
||||
)
|
||||
android.AssertStringMatches(
|
||||
t,
|
||||
"androidmk has incorrect LOCAL_SOONG_INSTALL_PAIRS; expected to it to include foo.apk",
|
||||
baseEntries.EntryMap["LOCAL_SOONG_INSTALL_PAIRS"][0],
|
||||
"\\S+foo.apk",
|
||||
)
|
||||
android.AssertStringMatches(
|
||||
t,
|
||||
"androidmk has incorrect LOCAL_SOONG_INSTALL_PAIRS; expected to it to include app",
|
||||
baseEntries.EntryMap["LOCAL_SOONG_INSTALL_PAIRS"][0],
|
||||
"\\S+foo.apk:\\S+/target/product/test_device/system/priv-app/foo/foo.apk",
|
||||
)
|
||||
android.AssertStringMatches(
|
||||
t,
|
||||
"androidmk has incorrect LOCAL_SOONG_INSTALL_PAIRS; expected to it to include privapp_allowlist",
|
||||
baseEntries.EntryMap["LOCAL_SOONG_INSTALL_PAIRS"][0],
|
||||
"privapp_allowlist_com.android.foo.xml:\\S+/target/product/test_device/system/etc/permissions/privapp_allowlist_com.android.foo.xml",
|
||||
)
|
||||
|
||||
overrideAndroidApp := overrideApp.Module().(*AndroidApp)
|
||||
overrideEntries := android.AndroidMkEntriesForTest(t, result.TestContext, overrideAndroidApp)[0]
|
||||
android.AssertStringMatches(
|
||||
t,
|
||||
"androidmk has incorrect LOCAL_SOONG_INSTALLED_MODULE; expected to find bar.apk",
|
||||
overrideEntries.EntryMap["LOCAL_SOONG_INSTALLED_MODULE"][0],
|
||||
"\\S+bar.apk",
|
||||
)
|
||||
android.AssertStringMatches(
|
||||
t,
|
||||
"androidmk has incorrect LOCAL_SOONG_INSTALL_PAIRS; expected to it to include bar.apk",
|
||||
overrideEntries.EntryMap["LOCAL_SOONG_INSTALL_PAIRS"][0],
|
||||
"\\S+bar.apk",
|
||||
)
|
||||
android.AssertStringMatches(
|
||||
t,
|
||||
"androidmk has incorrect LOCAL_SOONG_INSTALL_PAIRS; expected to it to include app",
|
||||
overrideEntries.EntryMap["LOCAL_SOONG_INSTALL_PAIRS"][0],
|
||||
"\\S+bar.apk:\\S+/target/product/test_device/system/priv-app/bar/bar.apk",
|
||||
)
|
||||
android.AssertStringMatches(
|
||||
t,
|
||||
"androidmk has incorrect LOCAL_SOONG_INSTALL_PAIRS; expected to it to include privapp_allowlist",
|
||||
overrideEntries.EntryMap["LOCAL_SOONG_INSTALL_PAIRS"][0],
|
||||
"\\S+soong/.intermediates/foo/android_common_bar/privapp_allowlist_com.google.android.foo.xml:\\S+/target/product/test_device/system/etc/permissions/privapp_allowlist_com.google.android.foo.xml",
|
||||
)
|
||||
}
|
||||
|
Reference in New Issue
Block a user