From 6a0476930a6eab198155b60e0a9c7376a8cfc31b Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 18 Jul 2016 17:24:47 -0700 Subject: [PATCH 1/2] Remove the implicit "_" in subnames. The NDK stub libraries need to use subname, but should use "." instead of "_". Test: Still builds. Change-Id: Ib4b0303531e03968c55671ea167ab987adebd783 --- android/androidmk.go | 2 +- cc/androidmk.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/androidmk.go b/android/androidmk.go index 8d2951db4..7d7707f52 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -146,7 +146,7 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b } if data.SubName != "" { - name += "_" + data.SubName + name += data.SubName } if data.Custom != nil { diff --git a/cc/androidmk.go b/cc/androidmk.go index 7f1815597..70e1f474c 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -134,7 +134,7 @@ func (binary *binaryLinker) AndroidMk(ctx AndroidMkContext, ret *android.Android func (test *testBinaryLinker) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) { test.binaryLinker.AndroidMk(ctx, ret) if Bool(test.testLinker.Properties.Test_per_src) { - ret.SubName = test.binaryLinker.Properties.Stem + ret.SubName = "_" + test.binaryLinker.Properties.Stem } } From 5d723ab19ae7f38759a72202fff48e782faae9f8 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 18 Jul 2016 22:29:52 -0700 Subject: [PATCH 2/2] Add a timestamp touch rule. Test: Works for the NDK changes I'm working on. Change-Id: I2731ef159122d6d44a6494a6c975a687bb49ff56 --- android/defs.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/android/defs.go b/android/defs.go index be28e8bcd..9c6527d57 100644 --- a/android/defs.go +++ b/android/defs.go @@ -52,6 +52,13 @@ var ( }, "cpFlags") + // A timestamp touch rule. + Touch = pctx.StaticRule("Touch", + blueprint.RuleParams{ + Command: "touch $out", + Description: "touch $out", + }) + // A symlink rule. Symlink = pctx.StaticRule("Symlink", blueprint.RuleParams{