Merge "Use aapt2 flag --rename-resources-package in soong" am: f32bbf89de am:... (70eb8b71) · Commits · e / os / android_build_soong

java/app.go

+11 −1

Original line number	Diff line number	Diff line
		@@ -491,6 +491,16 @@ func (a *AndroidApp) shouldEmbedJnis(ctx android.BaseModuleContext) bool {
		!a.IsForPlatform() \|\| a.appProperties.AlwaysPackageNativeLibs
		}

		func generateAaptRenamePackageFlags(packageName string) []string {
		aaptFlags := []string{}
		aaptFlags = append(aaptFlags, "--rename-manifest-package "+packageName)
		// --rename-resources-package renames the package within the resources table to packageName.
		// Note: this will not rename the R.java file because the base module .R
		// package may be directly referenced in code.
		aaptFlags = append(aaptFlags, "--rename-resources-package "+packageName)
		return aaptFlags
		}

		func (a *AndroidApp) OverriddenManifestPackageName() string {
		return a.overriddenManifestPackageName
		}
		@@ -527,7 +537,7 @@ func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) {
		if !overridden {
		manifestPackageName = *a.overridableAppProperties.Package_name
		}
		aaptLinkFlags = append(aaptLinkFlags, "--rename-manifest-package "+manifestPackageName)
		aaptLinkFlags = append(aaptLinkFlags, generateAaptRenamePackageFlags(manifestPackageName)...)
		a.overriddenManifestPackageName = manifestPackageName
		}

java/app_test.go

+8 −8

Original line number	Diff line number	Diff line
		@@ -1748,7 +1748,7 @@ func TestOverrideAndroidApp(t *testing.T) {
		certFlag string
		lineageFlag string
		overrides []string
		aaptFlag string
		packageFlag string
		logging_parent string
		}{
		{
		@@ -1758,7 +1758,7 @@ func TestOverrideAndroidApp(t *testing.T) {
		certFlag: "build/make/target/product/security/expiredkey.x509.pem build/make/target/product/security/expiredkey.pk8",
		lineageFlag: "",
		overrides: []string{"qux"},
		aaptFlag: "",
		packageFlag: "",
		logging_parent: "",
		},
		{
		@@ -1768,7 +1768,7 @@ func TestOverrideAndroidApp(t *testing.T) {
		certFlag: "cert/new_cert.x509.pem cert/new_cert.pk8",
		lineageFlag: "--lineage lineage.bin",
		overrides: []string{"qux", "foo"},
		aaptFlag: "",
		packageFlag: "",
		logging_parent: "bah",
		},
		{
		@@ -1778,7 +1778,7 @@ func TestOverrideAndroidApp(t *testing.T) {
		certFlag: "build/make/target/product/security/expiredkey.x509.pem build/make/target/product/security/expiredkey.pk8",
		lineageFlag: "",
		overrides: []string{"qux", "foo"},
		aaptFlag: "--rename-manifest-package org.dandroid.bp",
		packageFlag: "org.dandroid.bp",
		logging_parent: "",
		},
		}
		@@ -1826,12 +1826,11 @@ func TestOverrideAndroidApp(t *testing.T) {
		expected.logging_parent, logging_parent)
		}

		// Check the package renaming flag, if exists.
		// Check the package renaming flags, if exists.
		res := variant.Output("package-res.apk")
		aapt2Flags := res.Args["flags"]
		if !strings.Contains(aapt2Flags, expected.aaptFlag) {
		t.Errorf("package renaming flag, %q is missing in aapt2 link flags, %q", expected.aaptFlag, aapt2Flags)
		}
		checkAapt2LinkFlag(t, aapt2Flags, "rename-manifest-package", expected.packageFlag)
		checkAapt2LinkFlag(t, aapt2Flags, "rename-resources-package", expected.packageFlag)
		}
		}

		@@ -1968,6 +1967,7 @@ func TestOverrideAndroidTest(t *testing.T) {
		res := variant.Output("package-res.apk")
		aapt2Flags := res.Args["flags"]
		checkAapt2LinkFlag(t, aapt2Flags, "rename-manifest-package", expected.packageFlag)
		checkAapt2LinkFlag(t, aapt2Flags, "rename-resources-package", expected.packageFlag)
		checkAapt2LinkFlag(t, aapt2Flags, "rename-instrumentation-target-package", expected.targetPackageFlag)
		}
		}