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

Make genrules uninstallable ETC instead of PHONY 

Makes it possible for make modules to depend on genrules via
constructs like $(call intermediates-dir-for,ETC,foo)/foo.

Test: presubmit
Change-Id: Ic9a014f55ea503f1c0c8167f351ecd1407083562
This commit is contained in:
Anton Hansson 2020-10-30 16:34:45 +00:00
parent e83dea5aac
commit 72f1849c71
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
genrule/genrule.go
View File

@ -561,13 +561,12 @@ func (g *Module) IDEInfo(dpInfo *android.IdeInfo) {
func (g *Module) AndroidMk() android.AndroidMkData { func (g *Module) AndroidMk() android.AndroidMkData {
return android.AndroidMkData{ return android.AndroidMkData{
Include: "$(BUILD_PHONY_PACKAGE)", Class: "ETC",
Class: "FAKE",
OutputFile: android.OptionalPathForPath(g.outputFiles[0]), OutputFile: android.OptionalPathForPath(g.outputFiles[0]),
SubName: g.subName, SubName: g.subName,
Extra: []android.AndroidMkExtraFunc{ Extra: []android.AndroidMkExtraFunc{
func(w io.Writer, outputFile android.Path) { func(w io.Writer, outputFile android.Path) {
fmt.Fprintln(w, "LOCAL_ADDITIONAL_DEPENDENCIES :=", strings.Join(g.outputDeps.Strings(), " ")) fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true")
}, },
}, },
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) { Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {