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

Remove apex.multi_install_skip_symbol_files

Browse Source 
This has been a workaround to avoid duplicate build rules for
multi-install apexes. The reason for duplicate errors was that apex_name
was used to install symbol files.

We don't need to rely on apex_name for symbol files, hence no need for
the workaround.

Note that symbol files for apexes are still available via the paths
based on "soong module name".

Bug: 267581665
Test: cuttlefish (which uses multi-apex) build & run
Change-Id: Icaca667e139ef2aca32339a75b54b12a00449c2d
This commit is contained in:
Jooyung Han
2023-02-07 14:13:24 +09:00
parent 2cd2f9ad89
commit 88b057efaa
3 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/androidmk.go
View File

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

10
apex/apex.go
View File

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

5
apex/builder.go
View File

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