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/glsl/Android.gen.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/glsl') diff --git a/src/glsl/Android.gen.mk b/src/glsl/Android.gen.mk index 137a97fa58a..0835871f912 100644 --- a/src/glsl/Android.gen.mk +++ b/src/glsl/Android.gen.mk @@ -27,7 +27,7 @@ ifeq ($(LOCAL_MODULE_CLASS),) LOCAL_MODULE_CLASS := STATIC_LIBRARIES endif -intermediates := $(call local-intermediates-dir) +intermediates := $(call local-generated-sources-dir) sources := \ glsl_lexer.cpp \ @@ -43,7 +43,6 @@ sources := \ LOCAL_SRC_FILES := $(filter-out $(sources), $(LOCAL_SRC_FILES)) LOCAL_C_INCLUDES += \ - $(intermediates) \ $(intermediates)/glcpp \ $(intermediates)/nir \ $(MESA_TOP)/src/glsl/glcpp \ -- cgit v1.2.3