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

Merge changes I2731ef15,Ib4b03035

Browse Source 
am: 93bf7d8506

Change-Id: I499e3c7849b542e9a14c68b07848a111938ea9ea
This commit is contained in:
Dan Albert
2016-07-19 18:46:32 +00:00
committed by android-build-merger
parent 2f95978837 93bf7d8506
commit b1e3684ead
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/androidmk.go
View File

@@ -146,7 +146,7 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b
} }
if data.SubName != "" { if data.SubName != "" {
name += "_" + data.SubName name += data.SubName
} }
if data.Custom != nil { if data.Custom != nil {

7
android/defs.go
View File

@@ -52,6 +52,13 @@ var (
}, },
"cpFlags") "cpFlags")
// A timestamp touch rule.
Touch = pctx.StaticRule("Touch",
blueprint.RuleParams{
Command: "touch $out",
Description: "touch $out",
})
// A symlink rule. // A symlink rule.
Symlink = pctx.StaticRule("Symlink", Symlink = pctx.StaticRule("Symlink",
blueprint.RuleParams{ blueprint.RuleParams{

2
cc/androidmk.go
View File

@@ -134,7 +134,7 @@ func (binary *binaryLinker) AndroidMk(ctx AndroidMkContext, ret *android.Android
func (test *testBinaryLinker) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) { func (test *testBinaryLinker) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
test.binaryLinker.AndroidMk(ctx, ret) test.binaryLinker.AndroidMk(ctx, ret)
if Bool(test.testLinker.Properties.Test_per_src) { if Bool(test.testLinker.Properties.Test_per_src) {
ret.SubName = test.binaryLinker.Properties.Stem ret.SubName = "_" + test.binaryLinker.Properties.Stem
} }
} }