Merge changes I2731ef15,Ib4b03035

am: 93bf7d8506

Change-Id: I499e3c7849b542e9a14c68b07848a111938ea9ea

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 {

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{

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
 	}
 }