Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af8998cb authored by Jiyong Park's avatar Jiyong Park
Browse files

bundle config contains (path,manifest) pairs of embedded APKs 

If an APEX contains APKs and the manifest package name of the APKs are
overridden (either via override_android_app
orPRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES), that the path to the APK
(relative in the APEX) and the overridden manifest package name is
recorded in the bundle config file.

Exempt-From-Owner-Approval: cherry-pick from master

Bug: 148002117
Test: m

Merged-In: Ibb90bcefb77fa6b2dad77cb2facc6079de9ab154
(cherry picked from commit cfaa1643)
Change-Id: Ibb90bcefb77fa6b2dad77cb2facc6079de9ab154
parent d93e1b1e

apex/apex.go

+7 −0
Original line number Diff line number Diff line
@@ -1415,6 +1415,7 @@ type apexFile struct { 


	jacocoReportClassesFile android.Path     // only for javalibs and apps

	certificate             java.Certificate // only for apps

	overriddenPackageName   string           // only for apps

}



func newApexFile(ctx android.BaseModuleContext, builtFile android.Path, moduleName string, installDir string, class apexFileClass, module android.Module) apexFile {
@@ -1924,6 +1925,12 @@ func apexFileForAndroidApp(ctx android.BaseModuleContext, aapp interface { 
	af := newApexFile(ctx, fileToCopy, aapp.Name(), dirInApex, app, aapp)

	af.jacocoReportClassesFile = aapp.JacocoReportClassesFile()

	af.certificate = aapp.Certificate()



	if app, ok := aapp.(interface {

		OverriddenManifestPackageName() string

	}); ok {

		af.overriddenPackageName = app.OverriddenManifestPackageName()

	}

	return af

}

apex/apex_test.go

+8 −1
Original line number Diff line number Diff line
@@ -87,6 +87,12 @@ func withTargets(targets map[android.OsType][]android.Target) testCustomizer { 
	}

}



func withManifestPackageNameOverrides(specs []string) testCustomizer {

	return func(fs map[string][]byte, config android.Config) {

		config.TestProductVariables.ManifestPackageNameOverrides = specs

	}

}



func withBinder32bit(fs map[string][]byte, config android.Config) {

	config.TestProductVariables.Binder32bit = proptools.BoolPtr(true)

}
@@ -3630,12 +3636,13 @@ func TestAppBundle(t *testing.T) { 
			system_modules: "none",

			apex_available: [ "myapex" ],

		}

	`)

		`, withManifestPackageNameOverrides([]string{"AppFoo:com.android.foo"}))



	bundleConfigRule := ctx.ModuleForTests("myapex", "android_common_myapex_image").Description("Bundle Config")

	content := bundleConfigRule.Args["content"]



	ensureContains(t, content, `"compression":{"uncompressed_glob":["apex_payload.img","apex_manifest.*"]}`)

	ensureContains(t, content, `"apex_config":{"apex_embedded_apk_config":[{"package_name":"com.android.foo","path":"app/AppFoo/AppFoo.apk"}]}`)

}



func TestMain(m *testing.M) {

apex/builder.go

+25 −0
Original line number Diff line number Diff line
@@ -252,16 +252,41 @@ func (a *apexBundle) buildInstalledFilesFile(ctx android.ModuleContext, builtApe 
func (a *apexBundle) buildBundleConfig(ctx android.ModuleContext) android.OutputPath {

	output := android.PathForModuleOut(ctx, "bundle_config.json")



	type ApkConfig struct {

		Package_name string `json:"package_name"`

		Apk_path     string `json:"path"`

	}

	config := struct {

		Compression struct {

			Uncompressed_glob []string `json:"uncompressed_glob"`

		} `json:"compression"`

		Apex_config struct {

			Apex_embedded_apk_config []ApkConfig `json:"apex_embedded_apk_config,omitempty"`

		} `json:"apex_config,omitempty"`

	}{}



	config.Compression.Uncompressed_glob = []string{

		"apex_payload.img",

		"apex_manifest.*",

	}



	// collect the manifest names and paths of android apps

	// if their manifest names are overridden

	for _, fi := range a.filesInfo {

		if fi.class != app {

			continue

		}

		packageName := fi.overriddenPackageName

		if packageName != "" {

			config.Apex_config.Apex_embedded_apk_config = append(

				config.Apex_config.Apex_embedded_apk_config,

				ApkConfig{

					Package_name: packageName,

					Apk_path:     fi.Path(),

				})

		}

	}



	j, err := json.Marshal(config)

	if err != nil {

		panic(fmt.Errorf("error while marshalling to %q: %#v", output, err))

java/app.go

+7 −0
Original line number Diff line number Diff line
@@ -147,6 +147,8 @@ type AndroidApp struct { 
	additionalAaptFlags []string



	noticeOutputs android.NoticeOutputs



	overriddenManifestPackageName string

}



func (a *AndroidApp) IsInstallable() bool {
@@ -271,6 +273,10 @@ func (a *AndroidApp) shouldEmbedJnis(ctx android.BaseModuleContext) bool { 
		!a.IsForPlatform() || a.appProperties.AlwaysPackageNativeLibs

}



func (a *AndroidApp) OverriddenManifestPackageName() string {

	return a.overriddenManifestPackageName

}



func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) {

	a.aapt.usesNonSdkApis = Bool(a.Module.deviceProperties.Platform_apis)
@@ -304,6 +310,7 @@ func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) { 
			manifestPackageName = *a.overridableAppProperties.Package_name

		}

		aaptLinkFlags = append(aaptLinkFlags, "--rename-manifest-package "+manifestPackageName)

		a.overriddenManifestPackageName = manifestPackageName

	}



	aaptLinkFlags = append(aaptLinkFlags, a.additionalAaptFlags...)