Remove the implicit "_" in subnames.

The NDK stub libraries need to use subname, but should use "." instead
of "_".

Test: Still builds.
Change-Id: Ib4b0303531e03968c55671ea167ab987adebd783
This commit is contained in:
Dan Albert 2016-07-18 17:24:47 -07:00
parent 3d92b27717
commit 6a0476930a
2 changed files with 2 additions and 2 deletions

View file

@ -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 {

View file

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