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

Merge changes Icbdf4979,I1a6f135d

Browse Source 
* changes:
  Fix apex to override certificate
  Fix apex to follow deps of modules with stubs.
This commit is contained in:
Jooyung Han
2019-12-18 01:04:53 +00:00
committed by Gerrit Code Review
parent 9fd9b92d51 f121a657c9
commit 70415ceb9e
4 changed files with 155 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex.go
View File

@@ -1095,7 +1095,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// don't include it in this APEX
return false
}
if !a.Host() && (cc.IsStubs() || cc.HasStubsVariants()) {
if !a.Host() && !android.DirectlyInApex(ctx.ModuleName(), ctx.OtherModuleName(cc)) && (cc.IsStubs() || cc.HasStubsVariants()) {
// If the dependency is a stubs lib, don't include it in this APEX,
// but make sure that the lib is installed on the device.
// In case no APEX is having the lib, the lib is installed to the system