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

Merge "Switch instruction_set to *string"

This commit is contained in:
Treehugger Robot 2017-10-26 06:56:35 +00:00 committed by Gerrit Code Review
parent 8eadbf0aaf 5922f3cb6e
commit b563989f97
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++ // the instruction set architecture to use to compile the C/C++
// module. // 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 // list of directories relative to the root of the source tree that will
// be added to the include path using -I. // 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__") "-D__ANDROID_API__=__ANDROID_API_FUTURE__", "-D__ANDROID_VNDK__")
} }
instructionSet := compiler.Properties.Instruction_set instructionSet := proptools.String(compiler.Properties.Instruction_set)
if flags.RequiredInstructionSet != "" { if flags.RequiredInstructionSet != "" {
instructionSet = flags.RequiredInstructionSet instructionSet = flags.RequiredInstructionSet
} }