system/corennnnn
Revision | 93fd68762b32fdf9036bc0e6d9dd595ec5869eaf (tree) |
---|---|
Time | 2016-08-26 02:38:34 |
Author | Ma Jian <majian@jide...> |
Commiter | Chih-Wei Huang |
Fix build break on x86_64
When TARGET_ARCH=x86_64, the LOCAL_SRC_FILES will be wrongly set to
codegen.cpp.arm, but the android make will 'smartly' remove the suffix
".arm" and try to compile the codegen.cpp without the libenc dependency.
NO_REF_TASK
Tested: local build
Change-Id: I25df0692886fd8b7c56d467d3b6f674919b09b56
@@ -1,7 +1,7 @@ | ||
1 | 1 | LOCAL_PATH:= $(call my-dir) |
2 | 2 | include $(CLEAR_VARS) |
3 | 3 | |
4 | -ifeq ($(TARGET_ARCH),x86) | |
4 | +ifneq ($(filter x86%,$(TARGET_ARCH)),) | |
5 | 5 | LOCAL_SRC_FILES:= \ |
6 | 6 | codegen.cpp |
7 | 7 | else |
@@ -16,7 +16,7 @@ LOCAL_SHARED_LIBRARIES := \ | ||
16 | 16 | LOCAL_C_INCLUDES := \ |
17 | 17 | $(LOCAL_PATH)/../.. |
18 | 18 | |
19 | -ifeq ($(TARGET_ARCH),x86) | |
19 | +ifneq ($(filter x86%,$(TARGET_ARCH)),) | |
20 | 20 | LOCAL_STATIC_LIBRARIES := libenc |
21 | 21 | endif |
22 | 22 |