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

Use += for both assignments to LOCAL_C_INCLUDES

Browse Source 
include_dirs and local_include_dirs properties both translate to
LOCAL_C_INCLUDES.  Use += for both assignments so they don't
clobber eachother.

Change-Id: Ie9e5e28ecd5a7ca76ab2a981e7d50d2c9b93ad92
This commit is contained in:
Colin Cross
2015-06-30 12:19:47 -07:00
parent b3245e9cf6
commit c41f63071e
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
androidbp/cmd/androidbp.go
View File

@@ -218,6 +218,19 @@ func translateSuffixProperties(suffixProps []*bpparser.Property,
return
}
func appendAssign(name string, prop *bpparser.Property, suffix *string) ([]string, error) {
if suffix != nil {
name += "_" + *suffix
}
val, err := valueToString(prop.Value)
if err != nil {
return nil, err
}
return []string{
fmt.Sprintf("%s += %s", name, val),
}, nil
}
func prependLocalPath(name string, prop *bpparser.Property, suffix *string) ([]string, error) {
if suffix != nil {
name += "_" + *suffix
@@ -227,7 +240,7 @@ func prependLocalPath(name string, prop *bpparser.Property, suffix *string) ([]s
return nil, err
}
return []string{
fmt.Sprintf("%s := $(addprefix $(LOCAL_PATH)/,%s)\n", name, val),
fmt.Sprintf("%s += $(addprefix $(LOCAL_PATH)/,%s)", name, val),
}, nil
}