diff --git a/apex/androidmk.go b/apex/androidmk.go index b830dcf4b..f66ae168e 100644 --- a/apex/androidmk.go +++ b/apex/androidmk.go @@ -95,11 +95,6 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo return moduleNames } - // Avoid creating duplicate build rules for multi-installed APEXes. - if proptools.BoolDefault(a.properties.Multi_install_skip_symbol_files, false) { - return moduleNames - } - seenDataOutPaths := make(map[string]bool) for _, fi := range a.filesInfo { diff --git a/apex/apex.go b/apex/apex.go index a9c8afce7..3cdcd7985 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -149,16 +149,6 @@ type apexBundleProperties struct { // Should be only used in non-system apexes (e.g. vendor: true). Default is false. Use_vndk_as_stable *bool - // Whether this is multi-installed APEX should skip installing symbol files. - // Multi-installed APEXes share the same apex_name and are installed at the same time. - // Default is false. - // - // Should be set to true for all multi-installed APEXes except the singular - // default version within the multi-installed group. - // Only the default version can install symbol files in $(PRODUCT_OUT}/apex, - // or else conflicting build rules may be created. - Multi_install_skip_symbol_files *bool - // The type of APEX to build. Controls what the APEX payload is. Either 'image', 'zip' or // 'both'. When set to image, contents are stored in a filesystem image inside a zip // container. When set to zip, contents are stored in a zip container directly. This type is diff --git a/apex/builder.go b/apex/builder.go index 06f1dd0f5..49223a024 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -455,11 +455,6 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { installSymbolFiles := (!ctx.Config().KatiEnabled() || a.ExportedToMake()) && a.installable() - // Avoid creating duplicate build rules for multi-installed APEXes. - if proptools.BoolDefault(a.properties.Multi_install_skip_symbol_files, false) { - installSymbolFiles = false - - } // set of dependency module:location mappings installMapSet := make(map[string]bool)