Support per-module MakeVars
This allows setting per-module make variables earlier in the build, particularly for prebuilt_build_tool users like LEX/M4/BISON. I moved filegroup over because it's a simpler common interface, but it doesn't strictly need it. With this, the last user of the hardcoded cc.m4Cmd variable is gone. Test: Inspect out/soong/make_vars-*.mk, out/soong/late-*.mk Test: treehugger Change-Id: I195b688131feac0c100c338a0749368aa5d50f4f
This commit is contained in:
@@ -24,8 +24,6 @@ import (
|
||||
)
|
||||
|
||||
func init() {
|
||||
pctx.SourcePathVariable("m4Cmd", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/m4")
|
||||
|
||||
pctx.HostBinToolVariable("aidlCmd", "aidl-cpp")
|
||||
pctx.HostBinToolVariable("syspropCmd", "sysprop_cpp")
|
||||
}
|
||||
|
@@ -148,8 +148,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
|
||||
ctx.Strict("AIDL_CPP", "${aidlCmd}")
|
||||
ctx.Strict("ALLOWED_MANUAL_INTERFACE_PATHS", strings.Join(allowedManualInterfacePaths, " "))
|
||||
|
||||
ctx.Strict("M4", "${m4Cmd}")
|
||||
|
||||
ctx.Strict("RS_GLOBAL_INCLUDES", "${config.RsGlobalIncludes}")
|
||||
|
||||
ctx.Strict("SOONG_STRIP_PATH", "${stripPath}")
|
||||
|
Reference in New Issue
Block a user