StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: be24d2733c am: f0b01a78cd am: 197aa7ee68 am: 22a6b0e927 am: ee192978dd

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2626018

Change-Id: Ie78661717c6c701cb947eac73f75785e77b51034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-21 09:03:35 +00:00
committed by Automerger Merge Worker
parent df826c9252 ee192978dd
commit 5cf1d1370f
4 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -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
}

2
android/variable.go
View File

@@ -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"`

4
apex/apex.go
View File

@@ -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" {

26
apex/apex_test.go
View File

@@ -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 {