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

Switch instruction_set to *string 

So that the contents gets replaced when prepended/appended instead of
merged.

Test: Set instruction_set in a cc_defaults, and in a module.
Change-Id: I0f2c789231d89efa1ab053f9dc118cd19f11b0e6
This commit is contained in:
Dan Willemsen 2017-10-25 15:20:50 -07:00
parent 3615dcb30c
commit 5922f3cb6e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cc/compiler.go
View File

@ -62,7 +62,7 @@ type BaseCompilerProperties struct {
// the instruction set architecture to use to compile the C/C++
// module.
Instruction_set string `android:"arch_variant"`
Instruction_set *string `android:"arch_variant"`
// list of directories relative to the root of the source tree that will
// be added to the include path using -I.
@ -277,7 +277,7 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags) Flag
"-D__ANDROID_API__=__ANDROID_API_FUTURE__", "-D__ANDROID_VNDK__")
}
instructionSet := compiler.Properties.Instruction_set
instructionSet := proptools.String(compiler.Properties.Instruction_set)
if flags.RequiredInstructionSet != "" {
instructionSet = flags.RequiredInstructionSet
}