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

Commit 3ab2c3e6 authored by Jooyung Han's avatar Jooyung Han
Browse files

Install flattened/unflattend apexes for GSI 

GSI targets are supposed to have both 'flattened' and 'unflattened'
APEXes. By adding 'flattened' APEX as REQUIRED moduled for 'unflattened'
APEX, both will be installed togetther.

This is done by a new variable PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES,
which is set only for GSI targets.

Bug: 137802149
Test: lunch aosp_arm64-userdebug && m
  resulting apex images under /system/apex
  and flattened apexes under /system/system_ext/apex

Change-Id: I336e2674e427b358542e0045b2a49dfa3d84095b
parent 7b34ebf4

android/config.go

+4 −0
Original line number Diff line number Diff line
@@ -1091,6 +1091,10 @@ func (c *config) EnforceProductPartitionInterface() bool { 
	return Bool(c.productVariables.EnforceProductPartitionInterface)

}



func (c *config) InstallExtraFlattenedApexes() bool {

	return Bool(c.productVariables.InstallExtraFlattenedApexes)

}



func (c *config) ProductHiddenAPIStubs() []string {

	return c.productVariables.ProductHiddenAPIStubs

}

android/variable.go

+2 −0
Original line number Diff line number Diff line
@@ -311,6 +311,8 @@ type productVariables struct { 
	MissingUsesLibraries []string `json:",omitempty"`



	EnforceProductPartitionInterface *bool `json:",omitempty"`



	InstallExtraFlattenedApexes *bool `json:",omitempty"`

}



func boolPtr(v bool) *bool {

apex/apex.go

+4 −0
Original line number Diff line number Diff line
@@ -905,6 +905,10 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		} else {

			a.suffix = ""

			a.primaryApexType = true



			if ctx.Config().InstallExtraFlattenedApexes() {

				a.externalDeps = append(a.externalDeps, a.Name()+flattenedSuffix)

			}

		}

	case zipApex:

		if proptools.String(a.properties.Payload_type) == "zip" {

apex/apex_test.go

+23 −0
Original line number Diff line number Diff line
@@ -2458,6 +2458,29 @@ func TestApexWithTests(t *testing.T) { 
	ensureContains(t, androidMk, "LOCAL_MODULE := myapex\n")

}



func TestInstallExtraFlattenedApexes(t *testing.T) {

	ctx, config := testApex(t, `

		apex {

			name: "myapex",

			key: "myapex.key",

		}

		apex_key {

			name: "myapex.key",

			public_key: "testkey.avbpubkey",

			private_key: "testkey.pem",

		}

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

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

	})

	ab := ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().(*apexBundle)

	ensureListContains(t, ab.externalDeps, "myapex.flattened")

	mk := android.AndroidMkDataForTest(t, config, "", ab)

	var builder strings.Builder

	mk.Custom(&builder, ab.Name(), "TARGET_", "", mk)

	androidMk := builder.String()

	ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES += myapex.flattened")

}



func TestApexUsesOtherApex(t *testing.T) {

	ctx, _ := testApex(t, `

		apex {