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

Change install name of privapp allowlists

Browse Source 
Use the APK's filename as the on-device filename for the allowlist.
Previously the filename of the source xml file was used, which leads to
a problem when the same source file is used for different apps (even
if only one of those modules ends up being installed).

Bug: 284500052
Test: app_test.go & presubmit boot tests
(cherry picked from https://android-review.googlesource.com/q/commit:92d1f52790e83952bf305464f0083d8c05f4c557)
Merged-In: I0b43a35e3a310464d79d7f37e0900d639f4a479c
Change-Id: I0b43a35e3a310464d79d7f37e0900d639f4a479c
This commit is contained in:
Anton Hansson
2023-06-01 17:07:58 +00:00
parent 022adb0b8c
commit 0a3bb7dc5e
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/app.go
View File

@@ -795,8 +795,9 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
shouldInstallAppPackage := (Bool(a.Module.properties.Installable) || ctx.Host()) && apexInfo.IsForPlatform() && !a.appProperties.PreventInstall shouldInstallAppPackage := (Bool(a.Module.properties.Installable) || ctx.Host()) && apexInfo.IsForPlatform() && !a.appProperties.PreventInstall
if shouldInstallAppPackage { if shouldInstallAppPackage {
if a.privAppAllowlist.Valid() { if a.privAppAllowlist.Valid() {
installPath := android.PathForModuleInstall(ctx, "etc", "permissions") allowlistInstallPath := android.PathForModuleInstall(ctx, "etc", "permissions")
ctx.InstallFile(installPath, a.privAppAllowlist.Path().Base(), a.privAppAllowlist.Path()) allowlistInstallFilename := a.installApkName + ".xml"
ctx.InstallFile(allowlistInstallPath, allowlistInstallFilename, a.privAppAllowlist.Path())
} }
var extraInstalledPaths android.Paths var extraInstalledPaths android.Paths

8
java/app_test.go
View File

@@ -3586,8 +3586,8 @@ func TestPrivappAllowlist(t *testing.T) {
} }
// verify that permissions are copied to device // verify that permissions are copied to device
app.Output("out/soong/target/product/test_device/system/etc/permissions/privapp_allowlist_com.android.foo.xml") app.Output("out/soong/target/product/test_device/system/etc/permissions/foo.xml")
overrideApp.Output("out/soong/target/product/test_device/system/etc/permissions/privapp_allowlist_com.google.android.foo.xml") overrideApp.Output("out/soong/target/product/test_device/system/etc/permissions/bar.xml")
} }
func TestPrivappAllowlistAndroidMk(t *testing.T) { func TestPrivappAllowlistAndroidMk(t *testing.T) {
@@ -3638,7 +3638,7 @@ func TestPrivappAllowlistAndroidMk(t *testing.T) {
t, t,
"androidmk has incorrect LOCAL_SOONG_INSTALL_PAIRS; expected to it to include privapp_allowlist", "androidmk has incorrect LOCAL_SOONG_INSTALL_PAIRS; expected to it to include privapp_allowlist",
baseEntries.EntryMap["LOCAL_SOONG_INSTALL_PAIRS"][0], 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", "privapp_allowlist_com.android.foo.xml:\\S+/target/product/test_device/system/etc/permissions/foo.xml",
) )
overrideAndroidApp := overrideApp.Module().(*AndroidApp) overrideAndroidApp := overrideApp.Module().(*AndroidApp)
@@ -3665,6 +3665,6 @@ func TestPrivappAllowlistAndroidMk(t *testing.T) {
t, t,
"androidmk has incorrect LOCAL_SOONG_INSTALL_PAIRS; expected to it to include privapp_allowlist", "androidmk has incorrect LOCAL_SOONG_INSTALL_PAIRS; expected to it to include privapp_allowlist",
overrideEntries.EntryMap["LOCAL_SOONG_INSTALL_PAIRS"][0], 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", "\\S+soong/.intermediates/foo/android_common_bar/privapp_allowlist_com.google.android.foo.xml:\\S+/target/product/test_device/system/etc/permissions/bar.xml",
) )
} }