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

Merge "Fix: stubs lib is installed in APEX"

Browse Source
This commit is contained in:
Treehugger Robot
2019-01-03 23:15:03 +00:00
committed by Gerrit Code Review
parent dddedf2e8c 67883b3ec6
commit f17284e05d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex_test.go
View File

@@ -664,5 +664,5 @@ func TestStaticLinking(t *testing.T) {
ldFlags := ctx.ModuleForTests("not_in_apex", "android_arm64_armv8-a_core").Rule("ld").Args["libFlags"] ldFlags := ctx.ModuleForTests("not_in_apex", "android_arm64_armv8-a_core").Rule("ld").Args["libFlags"]
// Ensure that not_in_apex is linking with the static variant of mylib // Ensure that not_in_apex is linking with the static variant of mylib
ensureContains(t, ldFlags, "mylib/android_arm64_armv8-a_core_static/mylib.a") ensureContains(t, ldFlags, "mylib/android_arm64_armv8-a_core_static_platform/mylib.a")
} }

2
cc/library.go
View File

@@ -1059,7 +1059,7 @@ func VersionMutator(mctx android.BottomUpMutatorContext) {
stubsVersionsFor(mctx.Config())[mctx.ModuleName()] = copiedVersions stubsVersionsFor(mctx.Config())[mctx.ModuleName()] = copiedVersions
// "" is for the non-stubs variant // "" is for the non-stubs variant
versions = append(versions, "") versions = append([]string{""}, versions...)
modules := mctx.CreateVariations(versions...) modules := mctx.CreateVariations(versions...)
for i, m := range modules { for i, m := range modules {