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

Commit ddd7d0ca authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix vndk snapshot suffix on Makefile"

parents 4726b9c8 752edec2

cc/cc.go

+6 −1
Original line number Diff line number Diff line
@@ -2433,8 +2433,13 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 


			if c, ok := ccDep.(*Module); ok {

				// Use base module name for snapshots when exporting to Makefile.

				if c.isSnapshotPrebuilt() && !c.IsVndk() {

				if c.isSnapshotPrebuilt() {

					baseName := c.BaseModuleName()



					if c.IsVndk() {

						return baseName + ".vendor"

					}



					if vendorSuffixModules[baseName] {

						return baseName + ".vendor"

					} else {