From 065fbeb146f126d87a7d8ed77b251bf14c249146 Mon Sep 17 00:00:00 2001 From: Owen Kim Date: Tue, 16 Nov 2021 07:08:15 +0000 Subject: [PATCH] Revert "Adds multi_install_skip_symbol_files field (default fals..." Revert submission 1869814-vapex-multi-config Bug: 206551398 Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/view?invocationId=I55600009996329947&testResultId=TR93527797572038984, bug b/206551398 Reverted Changes: I0cd9d748d:Adds multi_install_skip_symbol_files field (defaul... I5912a18e3:Demonstrate multi-installed APEXes. I0e6881e3a:Load persist props before starting apexd. I932442ade:Adds a new prop context for choosing between multi... I754ecc3f7:Allow users to choose between multi-installed vend... Change-Id: If09bf590e3ad93e14fbf89299f80d497c9604a78 --- apex/androidmk.go | 5 ----- apex/apex.go | 10 ---------- 2 files changed, 15 deletions(-) diff --git a/apex/androidmk.go b/apex/androidmk.go index 494cf2114..80237fb5f 100644 --- a/apex/androidmk.go +++ b/apex/androidmk.go @@ -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() { diff --git a/apex/apex.go b/apex/apex.go index 1021d4ebd..33188cbcb 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -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.