From 948c8f502a3b3144588a6e707b0ea60afa766ebb Mon Sep 17 00:00:00 2001 From: Daniel Charles Date: Thu, 26 Jul 2012 14:18:15 -0700 Subject: android-build: fix dricore build for autogenerated files (v3) Recently more files were removed from control to be auto-generated in the dricore library. Android build was not able to locate the new files if they were not created beforehand. LOCAL_SRC_FILES includes some of those files and Android.gen.mk re-defines this variable by filtering out the auto-generated files. Unfortunately for this variable it is not the same to have the SRCDIR variable defined as the current directory. By re-defining SRCDIR for the autotools build the Android build system is happy again and the new files were actually removed from the sources to use the auto generated versions. Also patch d5c1801a018efda8ac2b was partially reverted as the files can not be compiled to the LOCAL_PATH, instead they should live on the intermediates folder so that a clean can wipe them out. v3: [chad] Fix the definition of SRCDIR in libdricore/Makefile.am. Signed-off-by: Chad Versace Signed-off-by: Daniel Charles --- src/mesa/Android.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'src/mesa/Android.mk') diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk index 115db4703ef..4b62b8194b1 100644 --- a/src/mesa/Android.mk +++ b/src/mesa/Android.mk @@ -31,7 +31,6 @@ LOCAL_PATH := $(call my-dir) # MESA_GALLIUM_FILES # MESA_FILES # X86_FILES -SRCDIR = . include $(LOCAL_PATH)/sources.mak common_CFLAGS := \ -- cgit v1.2.3