From 44a752659cbcc56ed340375ec005771bcadcaa3a Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 29 Jan 2014 17:46:37 -0800 Subject: [PATCH] build: support LOCAL_*_32 and LOCAL_*_64 Support the following new variables based on whether the current multilib target is 32 bit or 64 bit: LOCAL_CFLAGS_32 LOCAL_CFLAGS_64 LOCAL_LDFLAGS_32 LOCAL_LDFLAGS_64 LOCAL_ASFLAGS_32 LOCAL_ASFLAGS_64 LOCAL_C_INCLUDES_32 LOCAL_C_INCLUDES_64 Change-Id: Ia868d56dff114be301bf8297eec768675f186927 --- core/binary.mk | 9 +++++---- core/clear_vars.mk | 9 +++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/core/binary.mk b/core/binary.mk index adc2f4466..957cdc497 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -88,13 +88,14 @@ include $(BUILD_SYSTEM)/base_rules.mk my_src_files := $(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) my_static_libraries := $(LOCAL_STATIC_LIBRARIES) my_shared_libraries := $(LOCAL_SHARED_LIBRARIES) -my_cflags := $(LOCAL_CFLAGS) $(LOCAL_CFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) +my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_IS_64_BIT),64,32) +my_cflags := $(LOCAL_CFLAGS) $(LOCAL_CFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CFLAGS_$(my_32_64_bit_suffix)) my_cppflags := $(LOCAL_CPPFLAGS) -my_ldflags := $(LOCAL_LDFLAGS) $(LOCAL_LDFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) -my_asflags := $(LOCAL_ASFLAGS) $(LOCAL_ASFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) +my_ldflags := $(LOCAL_LDFLAGS) $(LOCAL_LDFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_LDFLAGS_$(my_32_64_bit_suffix)) +my_asflags := $(LOCAL_ASFLAGS) $(LOCAL_ASFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_ASFLAGS_$(my_32_64_bit_suffix)) my_cc := $(LOCAL_CC) my_cxx := $(LOCAL_CXX) -my_c_includes := $(LOCAL_C_INCLUDES) $(LOCAL_C_INCLUDES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) +my_c_includes := $(LOCAL_C_INCLUDES) $(LOCAL_C_INCLUDES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_C_INCLUDES_$(my_32_64_bit_suffix)) my_generated_sources := $(LOCAL_GENERATED_SOURCES) my_cflags := $(filter-out $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_UNSUPPORTED_CFLAGS),$(my_cflags)) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 8863fe6b8..32e1de6d3 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -162,6 +162,15 @@ LOCAL_NO_CRT_$(TARGET_2ND_ARCH):= LOCAL_LDFLAGS_$(TARGET_2ND_ARCH):= endif +LOCAL_CFLAGS_32:= +LOCAL_CFLAGS_64:= +LOCAL_LDFLAGS_32:= +LOCAL_LDFLAGS_64:= +LOCAL_ASFLAGS_32:= +LOCAL_ASFLAGS_64:= +LOCAL_C_INCLUDES_32:= +LOCAL_C_INCLUDES_64:= + # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # iterate over thousands of entries every time. # Leave the current makefile to make sure we don't break anything