Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES"
diff --git a/android/config.go b/android/config.go
index 60c3e9b..242be18 100644
--- a/android/config.go
+++ b/android/config.go
@@ -1681,10 +1681,6 @@
return c.productVariables.InterPartitionJavaLibraryAllowList
}
-func (c *config) InstallExtraFlattenedApexes() bool {
- return Bool(c.productVariables.InstallExtraFlattenedApexes)
-}
-
func (c *config) ProductHiddenAPIStubs() []string {
return c.productVariables.ProductHiddenAPIStubs
}
diff --git a/android/variable.go b/android/variable.go
index 6362953..c5f1823 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -431,8 +431,6 @@
EnforceInterPartitionJavaSdkLibrary *bool `json:",omitempty"`
InterPartitionJavaLibraryAllowList []string `json:",omitempty"`
- InstallExtraFlattenedApexes *bool `json:",omitempty"`
-
BoardUsesRecoveryAsBoot *bool `json:",omitempty"`
BoardKernelBinaries []string `json:",omitempty"`
diff --git a/apex/apex.go b/apex/apex.go
index 32d7250..51c67d0 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -2151,10 +2151,6 @@
} 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" {
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 149b177..984ca41 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -6122,32 +6122,6 @@
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 {