Merge "Remove "flattened" apexes"

This commit is contained in:
Jooyung Han
2023-06-23 04:09:48 +00:00
committed by Gerrit Code Review
7 changed files with 98 additions and 317 deletions

View File

@@ -1645,10 +1645,6 @@ func (c *config) AmlAbis() bool {
return Bool(c.productVariables.Aml_abis)
}
func (c *config) FlattenApex() bool {
return Bool(c.productVariables.Flatten_apex)
}
func (c *config) ForceApexSymlinkOptimization() bool {
return Bool(c.productVariables.ForceApexSymlinkOptimization)
}

View File

@@ -175,10 +175,6 @@ type variableProperties struct {
Whole_static_libs []string `android:"arch_variant"`
} `android:"arch_variant"`
Flatten_apex struct {
Enabled *bool
}
Native_coverage struct {
Src *string `android:"arch_variant"`
Srcs []string `android:"arch_variant"`
@@ -397,7 +393,6 @@ type productVariables struct {
Ndk_abis *bool `json:",omitempty"`
TrimmedApex *bool `json:",omitempty"`
Flatten_apex *bool `json:",omitempty"`
ForceApexSymlinkOptimization *bool `json:",omitempty"`
CompressedApex *bool `json:",omitempty"`
Aml_abis *bool `json:",omitempty"`