From 39299e61610198b3d3c511a58ea540471d8e29c2 Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Wed, 13 Jun 2018 22:32:16 +0800 Subject: Fix VNDK-Ext ABI check regression VNDK-Ext are modules with `vndk.enabled: true` but not having `vendor_available: true`. In addition, VNDK-Ext should be checked by source ABI checker. This change fixes the regression introduced in Bug: 110142940 Test: Create libminijail_ext, break some ABIs, and see an error. Merged-In: I8b47ac12d2e132f641129c9549ed22c3971d6c89 Change-Id: I8b47ac12d2e132f641129c9549ed22c3971d6c89 (cherry picked from commit ef1ff3de9804d8e99df06f0874c974b3f1e85e36) Signed-off-by: Jayant Chowdhary --- cc/cc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cc/cc.go b/cc/cc.go index ca3f8726..51ac1840 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -546,7 +546,7 @@ func (ctx *moduleContextImpl) createVndkSourceAbiDump() bool { isVariantOnProductionDevice = sanitize.isVariantOnProductionDevice() } vendorAvailable := Bool(ctx.mod.VendorProperties.Vendor_available) - return !skipAbiChecks && isVariantOnProductionDevice && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk() && vendorAvailable) || inList(ctx.baseModuleName(), llndkLibraries)) + return !skipAbiChecks && isVariantOnProductionDevice && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk() && (vendorAvailable || ctx.isVndkExt())) || inList(ctx.baseModuleName(), llndkLibraries)) } func (ctx *moduleContextImpl) selectedStl() string { -- cgit v1.2.3 From 9747eed816fda6b1766f20dfb84b43ffe4abc1be Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Thu, 14 Jun 2018 22:38:10 -0700 Subject: Update ToolingCFlags overrides to include other new architectures Bug: 110235326 Test: m checkbuild Change-Id: Ifaa35db08d35ed3cb14fce3e9c5643f26bc3f706 Merged-In: I9d0ada05d95bb260500c1d694332a73363b0f299 (cherry picked from commit 32a779171b78615b231d0680872942d2dd07b519) --- cc/sabi.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cc/sabi.go b/cc/sabi.go index f5a7c774..42b2f352 100644 --- a/cc/sabi.go +++ b/cc/sabi.go @@ -74,8 +74,13 @@ func (sabimod *sabi) flags(ctx ModuleContext, flags Flags) Flags { // RSClang does not support recent mcpu option likes exynos-m2. // So we need overriding mcpu option when we want to use it. - if ctx.Arch().CpuVariant == "exynos-m2" { - flags.ToolingCFlags = append(flags.ToolingCFlags, "-mcpu=cortex-a53") + mappedArch := map[string]string{ + "exynos-m2": "cortex-a53", + "cortex-a55": "cortex-a53", + "cortex-a75": "cortex-a57", + } + if arch, ok := mappedArch[ctx.Arch().CpuVariant]; ok { + flags.ToolingCFlags = append(flags.ToolingCFlags, "-mcpu="+arch) } return flags -- cgit v1.2.3 From 40c869b0aeff3df0d34a6b0540c1a04c142552ff Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Sun, 17 Jun 2018 02:15:24 -0700 Subject: Remove workaround for cortex-a55/a75 Test: m checkbuild Test: boot on a55/a75 device, pass bionic tests Bug: 110235326 Change-Id: I5ab2102352a6efe1173b3097875e6e779d4a1a09 Merged-In: I5ab2102352a6efe1173b3097875e6e779d4a1a09 (cherry picked from commit 9a350e644b4e5762df5838e007a55af68449c937) --- cc/config/arm64_device.go | 9 +++------ cc/config/arm_device.go | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go index b2b07648..00c29f53 100644 --- a/cc/config/arm64_device.go +++ b/cc/config/arm64_device.go @@ -50,15 +50,12 @@ var ( "-mcpu=cortex-a53", }, "cortex-a55": []string{ - // The cortex-a55 target is not yet supported, - // so use cortex-a53. - "-mcpu=cortex-a53", + "-mcpu=cortex-a55", }, "cortex-a75": []string{ - // Use the cortex-a53 since it is similar to the little + // Use the cortex-a55 since it is similar to the little // core (cortex-a55) and is sensitive to ordering. - // The cortex-a55 target is not yet supported. - "-mcpu=cortex-a53", + "-mcpu=cortex-a55", }, "kryo": []string{ // Use the cortex-a57 cpu since some compilers diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go index 4e0f6e05..cad1b161 100644 --- a/cc/config/arm_device.go +++ b/cc/config/arm_device.go @@ -98,7 +98,7 @@ var ( "-D__ARM_FEATURE_LPAE=1", }, "cortex-a55": []string{ - "-mcpu=cortex-a53", + "-mcpu=cortex-a55", "-mfpu=neon-fp-armv8", // Fake an ARM compiler flag as these processors support LPAE which GCC/clang // don't advertise. @@ -107,7 +107,7 @@ var ( "-D__ARM_FEATURE_LPAE=1", }, "cortex-a75": []string{ - "-mcpu=cortex-a53", + "-mcpu=cortex-a55", "-mfpu=neon-fp-armv8", // Fake an ARM compiler flag as these processors support LPAE which GCC/clang // don't advertise. -- cgit v1.2.3