openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Export -D__BRILLO__ to make if necessary 

am: 06f453359a

* commit '06f453359a6686e20d00e7ab661e39ce0e0e5bb5':
  Export -D__BRILLO__ to make if necessary

Change-Id: I0b5236fe6a32c52e00e50d88b99928a1ad4ef6ad
This commit is contained in:
Dan Willemsen 2016-05-17 02:41:00 +00:00 committed by android-build-merger
parent fb2eaaf8f2 06f453359a
commit da8b053323
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cc/makevars.go
View File

@ -74,6 +74,10 @@ func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string,
globalCflags := fmt.Sprintf("${commonGlobalCflags} ${%sGlobalCflags}", hod) globalCflags := fmt.Sprintf("${commonGlobalCflags} ${%sGlobalCflags}", hod)
if hod.Device() && Bool(ctx.Config().ProductVariables.Brillo) {
globalCflags += " -D__BRILLO__"
}
ctx.StrictSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{ ctx.StrictSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{
toolchain.ToolchainCflags(), toolchain.ToolchainCflags(),
globalCflags, globalCflags,
@ -93,6 +97,10 @@ func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string,
globalClangCflags := fmt.Sprintf("${commonClangGlobalCflags} ${clangExtraCflags} ${%sClangGlobalCflags}", hod) globalClangCflags := fmt.Sprintf("${commonClangGlobalCflags} ${clangExtraCflags} ${%sClangGlobalCflags}", hod)
if hod.Device() && Bool(ctx.Config().ProductVariables.Brillo) {
globalClangCflags += " -D__BRILLO__"
}
ctx.StrictSorted(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{ ctx.StrictSorted(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{
toolchain.ToolchainClangCflags(), toolchain.ToolchainClangCflags(),
globalClangCflags, globalClangCflags,