Apply native_bridge suffix to all cc_modules
This fixes the problem with cc_object not having this suffix and as a result overriding non-bridged variants for modules using mk files. Bug: http://b/77159578 Test: build 4arch product Change-Id: Ie958f997c6f54f93d8b2987ca5ba605004e1eb70
This commit is contained in:
@@ -28,10 +28,6 @@ import (
|
||||
"github.com/google/blueprint/bootstrap"
|
||||
)
|
||||
|
||||
var (
|
||||
NativeBridgeSuffix = ".native_bridge"
|
||||
)
|
||||
|
||||
func init() {
|
||||
RegisterSingletonType("androidmk", AndroidMkSingleton)
|
||||
}
|
||||
@@ -165,10 +161,6 @@ func (a *AndroidMkEntries) fillInEntries(config Config, bpPath string, mod bluep
|
||||
}
|
||||
}
|
||||
|
||||
if amod.Target().NativeBridge {
|
||||
a.SubName += NativeBridgeSuffix
|
||||
}
|
||||
|
||||
fmt.Fprintln(&a.header, "\ninclude $(CLEAR_VARS)")
|
||||
|
||||
// Collect make variable assignment entries.
|
||||
|
Reference in New Issue
Block a user