On 19 July 2017 at 08:12, Tapani Pälli <tapani.pa...@intel.com> wrote: > Depending on build order, LOCAL_PATH maybe set or not (and can't > be trusted to have assumed path), change modifies all occurences > of LOCAL_PATH as locally defined COMPILER_PATH instead. > Sounds like a bug somewhere or a fundamental breakage in the Android world.
$cat src/compiler/Android.mk ... LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/Android.glsl.mk include $(LOCAL_PATH)/Android.nir.mk ... $cat src/compiler/Android.nir.mk ... LOCAL_PATH := $(call my-dir) ... include $(CLEAR_VARS) // is this one one causing problems? ... include $(LOCAL_PATH)/Android.nir.gen.mk ... Hence LOCAL_PATH should be set, and should point to the correct place. > Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> > --- > src/compiler/Android.nir.gen.mk | 38 ++++++++++++++++++++------------------ > 1 file changed, 20 insertions(+), 18 deletions(-) > > diff --git a/src/compiler/Android.nir.gen.mk b/src/compiler/Android.nir.gen.mk > index 4507ac4..81511de 100644 > --- a/src/compiler/Android.nir.gen.mk > +++ b/src/compiler/Android.nir.gen.mk > @@ -27,6 +27,8 @@ ifeq ($(LOCAL_MODULE_CLASS),) > LOCAL_MODULE_CLASS := STATIC_LIBRARIES > endif > > +COMPILER_PATH := $(MESA_TOP)/src/compiler > + A define LOCAL_PATH at the top of the file should also work, right? Thanks Emil _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
