OSDN Git Service

Fix build break on x86_64
authorMa Jian <majian@jidemail.com>
Wed, 6 Jul 2016 10:31:55 +0000 (18:31 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Sat, 6 May 2017 14:54:43 +0000 (22:54 +0800)
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

libpixelflinger/tests/codegen/Android.mk

index 045a68e..b96b9be 100644 (file)
@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-ifeq ($(TARGET_ARCH),x86)
+ifneq ($(filter x86%,$(TARGET_ARCH)),)
 LOCAL_SRC_FILES:= \
     codegen.cpp
 else
@@ -16,7 +16,7 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_C_INCLUDES := \
        $(LOCAL_PATH)/../..
 
-ifeq ($(TARGET_ARCH),x86)
+ifneq ($(filter x86%,$(TARGET_ARCH)),)
 LOCAL_STATIC_LIBRARIES := libenc
 endif