diff options
author | android-build-team Robot | 2018-06-18 18:34:53 -0500 |
---|---|---|
committer | android-build-team Robot | 2018-06-18 18:34:53 -0500 |
commit | a427e814f07d071b4a3c31976a7701b4f80546b5 (patch) | |
tree | 0389234c7461d39dc7d89dd521d1df2e66f09900 | |
parent | ba27e13355e235cea24c0f16f3f5bb23e6dfd88a (diff) | |
parent | 8f303934e89b89fd2aad31defe606e0a74138ae1 (diff) | |
download | platform-build-soong-a427e814f07d071b4a3c31976a7701b4f80546b5.tar.gz platform-build-soong-a427e814f07d071b4a3c31976a7701b4f80546b5.tar.xz platform-build-soong-a427e814f07d071b4a3c31976a7701b4f80546b5.zip |
Merge cherrypicks of [4368877, 4369031, 4369032, 4369033, 4369034, 4368878, 4369035, 4369036, 4369008] into pi-releaseandroid-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r2android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r6android-9.0.0_r5android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1pie-release
Change-Id: I758bc94b92ca72e194430c56a45615b71a8c39ab
-rw-r--r-- | cc/cc.go | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -546,7 +546,7 @@ func (ctx *moduleContextImpl) createVndkSourceAbiDump() bool { | |||
546 | isVariantOnProductionDevice = sanitize.isVariantOnProductionDevice() | 546 | isVariantOnProductionDevice = sanitize.isVariantOnProductionDevice() |
547 | } | 547 | } |
548 | vendorAvailable := Bool(ctx.mod.VendorProperties.Vendor_available) | 548 | vendorAvailable := Bool(ctx.mod.VendorProperties.Vendor_available) |
549 | return !skipAbiChecks && isVariantOnProductionDevice && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk() && vendorAvailable) || inList(ctx.baseModuleName(), llndkLibraries)) | 549 | return !skipAbiChecks && isVariantOnProductionDevice && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk() && (vendorAvailable || ctx.isVndkExt())) || inList(ctx.baseModuleName(), llndkLibraries)) |
550 | } | 550 | } |
551 | 551 | ||
552 | func (ctx *moduleContextImpl) selectedStl() string { | 552 | func (ctx *moduleContextImpl) selectedStl() string { |