summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <[email protected]>2016-02-02 14:45:09 -0600
committerEmil Velikov <[email protected]>2016-02-18 17:47:33 +0000
commit7efc273df18797e8aff671fe09e926b37d938c38 (patch)
treea6bddb00bceb7e9d8232f683f05c106c44e656ab
parent1f53a57b2f19116ddde7eab1d922fdd0ab1835e0 (diff)
Android: enable building on arm64
Use the LOCAL_CFLAGS_{32/64} instead of arch specific variants to define the DEFAULT_DRIVER_DIR. This enables building for arm64. Cc: Chih-Wei Huang <[email protected]> Signed-off-by: Rob Herring <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
-rw-r--r--src/egl/Android.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index ebd67af34cc..cf7125145ca 100644
--- a/src/egl/Android.mk
+++ b/src/egl/Android.mk
@@ -44,9 +44,8 @@ LOCAL_CFLAGS := \
-DHAVE_ANDROID_PLATFORM
ifeq ($(MESA_LOLLIPOP_BUILD),true)
-LOCAL_CFLAGS_arm := -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
-LOCAL_CFLAGS_x86 := -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
-LOCAL_CFLAGS_x86_64 := -DDEFAULT_DRIVER_DIR=\"/system/lib64/dri\"
+LOCAL_CFLAGS_32 := -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
+LOCAL_CFLAGS_64 := -DDEFAULT_DRIVER_DIR=\"/system/lib64/dri\"
else
LOCAL_CFLAGS += -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
endif