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

Merge "Pass exportedFlags directly to Make"

Browse Source
This commit is contained in:
Dan Willemsen
2017-04-05 05:43:02 +00:00
committed by Gerrit Code Review
parent 13fd3ff296 5853940a18
commit f3d98fbb59
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cc/androidmk.go
View File

@@ -77,23 +77,18 @@ func (c *Module) AndroidMk() (ret android.AndroidMkData, err error) {
return ret, nil return ret, nil
} }
func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) { func (library *libraryDecorator) androidMkWriteExportedFlags(w io.Writer) {
writeExportedIncludes := func(w io.Writer) { exportedFlags := library.exportedFlags()
var exportedIncludes []string if len(exportedFlags) > 0 {
for _, flag := range library.exportedFlags() { fmt.Fprintln(w, "LOCAL_EXPORT_CFLAGS :=", strings.Join(exportedFlags, " "))
if strings.HasPrefix(flag, "-I") {
exportedIncludes = append(exportedIncludes, strings.TrimPrefix(flag, "-I"))
} }
} exportedFlagsDeps := library.exportedFlagsDeps()
if len(exportedIncludes) > 0 { if len(exportedFlagsDeps) > 0 {
fmt.Fprintln(w, "LOCAL_EXPORT_C_INCLUDE_DIRS :=", strings.Join(exportedIncludes, " ")) fmt.Fprintln(w, "LOCAL_EXPORT_C_INCLUDE_DEPS :=", strings.Join(exportedFlagsDeps.Strings(), " "))
}
exportedIncludeDeps := library.exportedFlagsDeps()
if len(exportedIncludeDeps) > 0 {
fmt.Fprintln(w, "LOCAL_EXPORT_C_INCLUDE_DEPS :=", strings.Join(exportedIncludeDeps.Strings(), " "))
} }
} }
func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
if library.static() { if library.static() {
ret.Class = "STATIC_LIBRARIES" ret.Class = "STATIC_LIBRARIES"
} else if library.shared() { } else if library.shared() {
@@ -125,7 +120,7 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An
fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true") fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true")
} }
writeExportedIncludes(w) library.androidMkWriteExportedFlags(w)
fmt.Fprintln(w, "include $(BUILD_HEADER_LIBRARY)") fmt.Fprintln(w, "include $(BUILD_HEADER_LIBRARY)")
return nil return nil
@@ -135,7 +130,7 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An
} }
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error { ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error {
writeExportedIncludes(w) library.androidMkWriteExportedFlags(w)
fmt.Fprintln(w, "LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)"+outputFile.Ext()) fmt.Fprintln(w, "LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)"+outputFile.Ext())