Commit: 93fd68762b32fdf9036bc0e6d9dd595ec5869eaf - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Révision: 93fd68762b32fdf9036bc0e6d9dd595ec5869eaf (tree)
• l'heure: 2016-08-26 02:38:34
• Auteur: Ma Jian <majian@jide...>
• Commiter: Chih-Wei Huang

Message de Log

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

Change Summary

• modified: libpixelflinger/tests/codegen/Android.mk

Modification

--- a/libpixelflinger/tests/codegen/Android.mk
+++ b/libpixelflinger/tests/codegen/Android.mk
@@ -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