Message ID | 1412263592-3452-1-git-send-email-tim.gore@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 2 October 2014 16:26, <tim.gore@intel.com> wrote: > From: Tim Gore <tim.gore@intel.com> > > Since the igt_create_stereo_fb function moved into igt_fb.c > we need to add the definition of IGT_DATADIR in the Android > makefile in order to build the cairo dependent tests. > > Signed-off-by: Tim Gore <tim.gore@intel.com> Patch merged, thanks. > --- > lib/Android.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/Android.mk b/lib/Android.mk > index 5739c80..bd8cf58 100644 > --- a/lib/Android.mk > +++ b/lib/Android.mk > @@ -35,7 +35,7 @@ LOCAL_SHARED_LIBRARIES := libpciaccess \ > ifeq ("${ANDROID_HAS_CAIRO}", "1") > skip_lib_list := > LOCAL_C_INCLUDES += $(ANDROID_BUILD_TOP)/external/cairo-1.12.16/src > - LOCAL_CFLAGS += -DANDROID_HAS_CAIRO=1 > + LOCAL_CFLAGS += -DANDROID_HAS_CAIRO=1 -DIGT_DATADIR=\".\" > else > skip_lib_list := \ > igt_kms.c \ > -- > 2.1.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/lib/Android.mk b/lib/Android.mk index 5739c80..bd8cf58 100644 --- a/lib/Android.mk +++ b/lib/Android.mk @@ -35,7 +35,7 @@ LOCAL_SHARED_LIBRARIES := libpciaccess \ ifeq ("${ANDROID_HAS_CAIRO}", "1") skip_lib_list := LOCAL_C_INCLUDES += $(ANDROID_BUILD_TOP)/external/cairo-1.12.16/src - LOCAL_CFLAGS += -DANDROID_HAS_CAIRO=1 + LOCAL_CFLAGS += -DANDROID_HAS_CAIRO=1 -DIGT_DATADIR=\".\" else skip_lib_list := \ igt_kms.c \