diff options
| author | 2018-12-07 22:42:47 +0900 | |
|---|---|---|
| committer | 2018-12-10 13:33:41 +0900 | |
| commit | 28d395a149a62d237365ab8e059bf24e83e585b6 (patch) | |
| tree | e2afd9ec792f4b1498cf3211d35d415d689852fd /apex/apex.go | |
| parent | 02c0ad48ba8f56a07bb9d3562e1631c9fbb60e01 (diff) | |
Fix: build error when a lib with stubs is included in an APEX
apex { name: "foo", native_shared_libs: ["mylib"] }
cc_library { name: "mylib", shared_libs: ["other_lib"],
stubs: { versions: ["1"]}, }
This is causing build error due to missing variant for other_lib.
This is happening because the stubs variant of mylib is added to apex
foo instead of the non-stubs variant. Because stubs variant does not
have any further dependencies, other_lib is not included to the APEX and
is not built for it.
Fixing this issue by specifying the version variant when adding a lib to
the dependency of an APEX, so that non-stub variant of the lib is
depended on.
Test: m (apex_test updated)
Change-Id: I972b6dcbce11942f83a76212715ba915534ec3df
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apex/apex.go b/apex/apex.go index 5ce0e0573..e26849917 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -367,6 +367,7 @@ func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext, {Mutator: "arch", Variation: arch}, {Mutator: "image", Variation: "core"}, {Mutator: "link", Variation: "shared"}, + {Mutator: "version", Variation: ""}, // "" is the non-stub variant }, sharedLibTag, native_shared_libs...) ctx.AddFarVariationDependencies([]blueprint.Variation{ |