Return false in DirectlyInAnyApex for host libraries.
Host doesn't have apexes. Bug: 122947954 Test: build dex2oat, check that libnativebridge is installed. Change-Id: I3548e3f155a200e56d71e88631b71511bad84161
This commit is contained in:
@@ -32,6 +32,9 @@ type AndroidMkContext interface {
|
||||
Name() string
|
||||
Target() android.Target
|
||||
subAndroidMk(*android.AndroidMkData, interface{})
|
||||
Arch() android.Arch
|
||||
Os() android.OsType
|
||||
Host() bool
|
||||
useVndk() bool
|
||||
static() bool
|
||||
inRecovery() bool
|
||||
@@ -189,9 +192,9 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
if len(library.Properties.Stubs.Versions) > 0 && android.DirectlyInAnyApex(ctx.Name()) &&
|
||||
!ctx.inRecovery() && !ctx.useVndk() && !ctx.static() {
|
||||
if len(library.Properties.Stubs.Versions) > 0 &&
|
||||
android.DirectlyInAnyApex(ctx, ctx.Name()) && !ctx.inRecovery() && !ctx.useVndk() &&
|
||||
!ctx.static() {
|
||||
if !library.buildStubs() {
|
||||
ret.SubName = ".bootstrap"
|
||||
}
|
||||
|
Reference in New Issue
Block a user