Commit 76f0ba81 authored Apr 29, 2021 by Colin Cross

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

parent f7bcd42a

apex/androidmk.go

+0 −4

Original line number	Diff line number	Diff line
		@@ -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)