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

Commit be24d273 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES"

parents f615e900 eeeda8a9

android/config.go

+0 −4
Original line number Diff line number Diff line
@@ -1681,10 +1681,6 @@ func (c *config) InterPartitionJavaLibraryAllowList() []string { 
	return c.productVariables.InterPartitionJavaLibraryAllowList

}



func (c *config) InstallExtraFlattenedApexes() bool {

	return Bool(c.productVariables.InstallExtraFlattenedApexes)

}



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

	return c.productVariables.ProductHiddenAPIStubs

}

android/variable.go

+0 −2
Original line number Diff line number Diff line
@@ -431,8 +431,6 @@ type productVariables struct { 
	EnforceInterPartitionJavaSdkLibrary *bool    `json:",omitempty"`

	InterPartitionJavaLibraryAllowList  []string `json:",omitempty"`



	InstallExtraFlattenedApexes *bool `json:",omitempty"`



	BoardUsesRecoveryAsBoot *bool `json:",omitempty"`



	BoardKernelBinaries                []string `json:",omitempty"`

apex/apex.go

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

			a.suffix = ""

			a.primaryApexType = true



			if ctx.Config().InstallExtraFlattenedApexes() {

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

			}

		}

	case zipApex:

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

apex/apex_test.go

+0 −26
Original line number Diff line number Diff line
@@ -6122,32 +6122,6 @@ func TestApexWithTests(t *testing.T) { 
	ensureContainsOnce(t, flatAndroidMk, "LOCAL_TEST_DATA := :testdata/baz\n")

}



func TestInstallExtraFlattenedApexes(t *testing.T) {

	ctx := testApex(t, `

		apex {

			name: "myapex",

			key: "myapex.key",

			updatable: false,

		}

		apex_key {

			name: "myapex.key",

			public_key: "testkey.avbpubkey",

			private_key: "testkey.pem",

		}

	`,

		android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {

			variables.InstallExtraFlattenedApexes = proptools.BoolPtr(true)

		}),

	)

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

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

	mk := android.AndroidMkDataForTest(t, ctx, ab)

	var builder strings.Builder

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

	androidMk := builder.String()

	ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := apex_manifest.pb.myapex apex_pubkey.myapex myapex.flattened\n")

}



func TestErrorsIfDepsAreNotEnabled(t *testing.T) {

	testApexError(t, `module "myapex" .* depends on disabled module "libfoo"`, `

		apex {