Merge "Change install name of privapp allowlists" (672c1467) · Commits · e / os / android_build_soong

java/app.go

+3 −2

Original line number	Diff line number	Diff line
		@@ -795,8 +795,9 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
		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())
		allowlistInstallPath := android.PathForModuleInstall(ctx, "etc", "permissions")
		allowlistInstallFilename := a.installApkName + ".xml"
		ctx.InstallFile(allowlistInstallPath, allowlistInstallFilename, a.privAppAllowlist.Path())
		}

		var extraInstalledPaths android.Paths

java/app_test.go

+4 −4

Original line number	Diff line number	Diff line
		@@ -3545,8 +3545,8 @@ func TestPrivappAllowlist(t *testing.T) {
		}

		// verify that permissions are copied to device
		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")
		app.Output("out/soong/target/product/test_device/system/etc/permissions/foo.xml")
		overrideApp.Output("out/soong/target/product/test_device/system/etc/permissions/bar.xml")
		}

		func TestPrivappAllowlistAndroidMk(t *testing.T) {
		@@ -3597,7 +3597,7 @@ func TestPrivappAllowlistAndroidMk(t *testing.T) {
		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",
		"privapp_allowlist_com.android.foo.xml:\\S+/target/product/test_device/system/etc/permissions/foo.xml",
		)

		overrideAndroidApp := overrideApp.Module().(*AndroidApp)
		@@ -3624,6 +3624,6 @@ func TestPrivappAllowlistAndroidMk(t *testing.T) {
		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",
		"\\S+soong/.intermediates/foo/android_common_bar/privapp_allowlist_com.google.android.foo.xml:\\S+/target/product/test_device/system/etc/permissions/bar.xml",
		)
		}