StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export -D__BRILLO__ to make if necessary am: 06f453359a am: da8b053323

Browse Source 
am: 224361ead4

* commit '224361ead4ff8a831eb1df781d4a39093f4e40aa':
  Export -D__BRILLO__ to make if necessary

Change-Id: Ie77dc5ee2480c25f0ed9deb13a09db996e6830a2
This commit is contained in:
Dan Willemsen
2016-05-17 02:45:45 +00:00
committed by android-build-merger
parent 44cc025401 224361ead4
commit 3b4aae8a23
1 changed files with 8 additions and 0 deletions
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)
if hod.Device() && Bool(ctx.Config().ProductVariables.Brillo) {
globalCflags += " -D__BRILLO__"
}
ctx.StrictSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{
toolchain.ToolchainCflags(),
globalCflags,
@@ -93,6 +97,10 @@ func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string,
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{
toolchain.ToolchainClangCflags(),
globalClangCflags,