From 76f0ba81d36afedb92f9ddb42b29aad82f18c84b Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 29 Apr 2021 13:54:49 -0700 Subject: [PATCH] Ignore cc.Module.HideFromMake when producing flattened apex Android.mk entries The modules in a flattened apex have suffixes that ensure they don't conflict with the platform versions, so they can ignore HideFromMake. This ensures that Make can install symbols for all libraries in apexes. Fixes: 180622230 Test: banchan com.android.adbd && m && ls $OUT/symbols/apex/com.android.adbd/lib Change-Id: I76d1aba2eed6ae27d9a954bf88f40f0d00fc6a98 --- apex/androidmk.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/apex/androidmk.go b/apex/androidmk.go index 06d3b54a6..ebf08330b 100644 --- a/apex/androidmk.go +++ b/apex/androidmk.go @@ -118,10 +118,6 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo seenDataOutPaths := make(map[string]bool) for _, fi := range a.filesInfo { - if ccMod, ok := fi.module.(*cc.Module); ok && ccMod.Properties.HideFromMake { - continue - } - linkToSystemLib := a.linkToSystemLib && fi.transitiveDep && fi.availableToPlatform() moduleName := a.fullModuleName(apexBundleName, &fi)