On 07/20/2012 02:41 PM, Daniel Charles wrote: > 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 removing SRCDIR 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. > > Change-Id: I75e86453d23f6b6f0e2a7dfb1b48272965c9fbf2 > Signed-off-by: Daniel Charles <daniel.char...@intel.com> > --- > src/mesa/Android.gen.mk | 68 +++++-- > src/mesa/Android.mk | 1 - > src/mesa/sources.mak | 558 > +++++++++++++++++++++++------------------------ > 3 files changed, 330 insertions(+), 297 deletions(-) > > diff --git a/src/mesa/Android.gen.mk b/src/mesa/Android.gen.mk > index 2ea8cc4..5443bb9 100644
Daniel, By removing SRCDIR from sources.mak, this patch breaks the autotools build. See where SRCDIR is used in src/mesa/Makefile.am. If you were to redefine SRCDIR in Android*.mk to $(LOCAL_PATH), would that fix the Android build? If not, then we may have to resort to $(addprefix) magic. ---- Chad Versace chad.vers...@linux.intel.com _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
