Merge "Add target.linux for linux kernel based targets"

This commit is contained in:
Dan Willemsen
2017-10-06 19:43:34 +00:00
committed by Gerrit Code Review

View File

@@ -468,7 +468,7 @@ func createArchType(props reflect.Type) reflect.Type {
"Android64", "Android64",
"Android32", "Android32",
"Bionic", "Bionic",
// TODO(dwillemsen): "Linux", "Linux",
"Not_windows", "Not_windows",
"Arm_on_x86", "Arm_on_x86",
"Arm_on_x86_64", "Arm_on_x86_64",
@@ -479,7 +479,7 @@ func createArchType(props reflect.Type) reflect.Type {
for _, archType := range osArchTypeMap[os] { for _, archType := range osArchTypeMap[os] {
targets = append(targets, os.Field+"_"+archType.Name) targets = append(targets, os.Field+"_"+archType.Name)
if false { // TODO(dwillemsen): os.Linux() if os.Linux() {
target := "Linux_" + archType.Name target := "Linux_" + archType.Name
if !inList(target, targets) { if !inList(target, targets) {
targets = append(targets, target) targets = append(targets, target)
@@ -696,7 +696,7 @@ func (a *ModuleBase) setArchProperties(ctx BottomUpMutatorContext) {
// key: value, // key: value,
// }, // },
// } // }
if false { // TODO(dwillemsen): os.Linux() if os.Linux() {
field = "Linux" field = "Linux"
prefix = "target.linux" prefix = "target.linux"
a.appendProperties(ctx, genProps, targetProp, field, prefix) a.appendProperties(ctx, genProps, targetProp, field, prefix)