Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4090f7ad authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge changes from topic "installclean-symbols-mainline-prod" into mainline-prod 

* changes:
  Clean symbols directory during installclean
  Ignore cc.Module.HideFromMake when producing flattened apex Android.mk entries
parents 36be361d 54f6a89c

apex/androidmk.go

+0 −4
Original line number Diff line number Diff line
@@ -79,10 +79,6 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo 
	}



	for _, fi := range a.filesInfo {

		if ccMod, ok := fi.module.(*cc.Module); ok && ccMod.Properties.HideFromMake {

			continue

		}



		linkToSystemLib := a.linkToSystemLib && fi.transitiveDep && fi.AvailableToPlatform()



		var moduleName string

ui/build/cleanbuild.go

+2 −1
Original line number Diff line number Diff line
@@ -131,7 +131,8 @@ func installClean(ctx Context, config Config, what int) { 
		productOut("installer"),

		productOut("odm"),

		productOut("sysloader"),

		productOut("testcases"))

		productOut("testcases"),

		productOut("symbols"))

}



// Since products and build variants (unfortunately) shared the same