tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Adds multi_install_skip_symbol_files field (default fals..."" am: a10ebe60ab am: dcf7a82e43 am: 4c51ab52a6

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

Change-Id: I528bc8ae01b9e07cf427f0abe6399829471d08d8
This commit is contained in:
Owen Kim 2021-11-16 09:34:01 +00:00 committed by Automerger Merge Worker
commit eda61e7ead
2 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apex/androidmk.go
View file

@ -103,11 +103,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
}
var postInstallCommands []string
for _, fi := range a.filesInfo {
if a.linkToSystemLib && fi.transitiveDep && fi.availableToPlatform() {

10
apex/apex.go
View file

@ -135,16 +135,6 @@ type apexBundleProperties struct {
// Default: true.
Installable *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
// Whether this APEX can be compressed or not. Setting this property to false means this
// APEX will never be compressed. When set to true, APEX will be compressed if other
// conditions, e.g, target device needs to support APEX compression, are also fulfilled.