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/gallium/auxiliary | |
| 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/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/Android.mk | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/os/os_mman.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk index c7b2634b63c..96a2125defb 100644 --- a/src/gallium/auxiliary/Android.mk +++ b/src/gallium/auxiliary/Android.mk @@ -39,7 +39,7 @@ LOCAL_MODULE := libmesa_gallium # generate sources LOCAL_MODULE_CLASS := STATIC_LIBRARIES -intermediates := $(call local-intermediates-dir) +intermediates := $(call local-generated-sources-dir) LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(GENERATED_SOURCES)) $(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2) diff --git a/src/gallium/auxiliary/os/os_mman.h b/src/gallium/auxiliary/os/os_mman.h index 3fc8c432f80..e892610bdbd 100644 --- a/src/gallium/auxiliary/os/os_mman.h +++ b/src/gallium/auxiliary/os/os_mman.h @@ -54,7 +54,7 @@ extern "C" { #endif -#if defined(PIPE_OS_ANDROID) +#if defined(PIPE_OS_ANDROID) && !defined(__LP64__) extern void *__mmap2(void *, size_t, int, int, int, size_t); |