diff options
| author | Colin Cross <ccross@android.com> | 2014-03-25 23:48:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 23:48:13 +0000 |
| commit | c93c10a75bbf509891301fdf25eb1c94e4cf4ccf (patch) | |
| tree | c40f9e811257c0b4ca90bb691884796c159888d6 /core/binary.mk | |
| parent | dbe23f5d987fac0488ae385478ea2ddf1b8c41ae (diff) | |
| parent | 8295d6cd62ba73ea66e64204d2d0ea27b4b34889 (diff) | |
| download | build-c93c10a75bbf509891301fdf25eb1c94e4cf4ccf.zip build-c93c10a75bbf509891301fdf25eb1c94e4cf4ccf.tar.gz build-c93c10a75bbf509891301fdf25eb1c94e4cf4ccf.tar.bz2 | |
am 8295d6cd: am ce087413: am 36a67a90: Merge topic \'tests\'
* commit '8295d6cd62ba73ea66e64204d2d0ea27b4b34889':
add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
Diffstat (limited to 'core/binary.mk')
| -rw-r--r-- | core/binary.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/binary.mk b/core/binary.mk index 19617c7..8a7b49c 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -106,8 +106,6 @@ my_c_includes := $(LOCAL_C_INCLUDES) my_generated_sources := $(LOCAL_GENERATED_SOURCES) ifndef LOCAL_IS_HOST_MODULE -my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_IS_64_BIT),64,32) - my_src_files += $(LOCAL_SRC_FILES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_SRC_FILES_$(my_32_64_bit_suffix)) my_shared_libraries += $(LOCAL_SHARED_LIBRARIES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_SHARED_LIBRARIES_$(my_32_64_bit_suffix)) my_cflags += $(LOCAL_CFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CFLAGS_$(my_32_64_bit_suffix)) |