diff options
| author | Chih-Wei Huang <[email protected]> | 2015-04-04 05:01:22 +0800 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-04-22 15:53:35 +0100 |
| commit | b0e33c2256a68d87c4f67b6e25a86e594649ab93 (patch) | |
| tree | 7274eafbeb50b25ca9c7a4780e45519b730f0158 /src/egl | |
| parent | 671a55084649f9e33018b1e5e1af4e28c639bf3b (diff) | |
android: fix the building rules for Android 5.0
Android 5.0 allows modules to generate source into $OUT/gen, which will
then be copied into $OUT/obj and $OUT/obj_$(TARGET_2ND_ARCH) as necessary.
Modules will need to change calls to local-intermediates-dir into
local-generated-sources-dir.
The patch changes local-intermediates-dir into local-generated-sources-dir.
If the Android version is less than 5.0, fallback to local-intermediates-dir.
The patch also fixes the 64-bit building issue of Android 5.0.
v2 [Emil Velikov]
- Keep the LOCAL_UNSTRIPPED_PATH variable.
Signed-off-by: Chih-Wei Huang <[email protected]>
Diffstat (limited to 'src/egl')
| -rw-r--r-- | src/egl/drivers/dri2/Android.mk | 8 | ||||
| -rw-r--r-- | src/egl/main/Android.mk | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/egl/drivers/dri2/Android.mk b/src/egl/drivers/dri2/Android.mk index d48506a7e5a..5931ce8f2f0 100644 --- a/src/egl/drivers/dri2/Android.mk +++ b/src/egl/drivers/dri2/Android.mk @@ -32,10 +32,16 @@ LOCAL_SRC_FILES := \ platform_android.c LOCAL_CFLAGS := \ - -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\" \ -DHAVE_SHARED_GLAPI \ -DHAVE_ANDROID_PLATFORM +ifeq ($(MESA_LOLLIPOP_BUILD),true) +LOCAL_CFLAGS_x86 := -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\" +LOCAL_CFLAGS_x86_64 := -DDEFAULT_DRIVER_DIR=\"/system/lib64/dri\" +else +LOCAL_CFLAGS += -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\" +endif + LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/egl/main \ diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk index 4d0cc575f02..12b66d053fc 100644 --- a/src/egl/main/Android.mk +++ b/src/egl/main/Android.mk @@ -154,7 +154,11 @@ LOCAL_STATIC_LIBRARIES := \ libmesa_loader LOCAL_MODULE := libGLES_mesa +ifeq ($(MESA_LOLLIPOP_BUILD),true) +LOCAL_MODULE_RELATIVE_PATH := egl +else LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl +endif include $(MESA_COMMON_MK) include $(BUILD_SHARED_LIBRARY) |