From b0e33c2256a68d87c4f67b6e25a86e594649ab93 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Sat, 4 Apr 2015 05:01:22 +0800 Subject: 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 --- src/gallium/auxiliary/os/os_mman.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gallium/auxiliary/os') 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); -- cgit v1.2.3