Hi Mauro, I think you should put your name on the Copyright section of the Android.*.mk. I understand these files are copied. But it's you who created and modified these files. So it's better to use your name instead of Intel, LunarG, ...
2016-05-11 8:31 GMT+08:00 Rob Herring <robherri...@gmail.com>: > On Tue, May 10, 2016 at 6:56 PM, Mauro Rossi <issor.or...@gmail.com> wrote: >> This patch adds support for libisl static, needed to build i965. >> >> Android.genxml.gen.mk generates the necessary gen%_pack.h headers >> >> Android.gen.mk generates isl_format_layout.c > > [...] > >> diff --git a/src/intel/isl/Makefile.sources b/src/intel/isl/Makefile.sources >> new file mode 100644 >> index 0000000..c8eb5b3 >> --- /dev/null >> +++ b/src/intel/isl/Makefile.sources >> @@ -0,0 +1,31 @@ >> +libisl_FILES = \ > > Makefile.am needs to use all of these variables. Do that and this file > in a separate patch. > >> + isl.c \ >> + isl.h \ >> + isl_format.c \ >> + isl_format_layout.c \ >> + isl_gen4.c \ >> + isl_gen4.h \ >> + isl_gen6.c \ >> + isl_gen6.h \ >> + isl_storage_image.c >> + >> +libisl_gen7_FILES = \ >> + isl_gen7.c \ >> + isl_gen7.h \ >> + isl_surface_state.c >> + >> +libisl_gen75_FILES = \ >> + isl_surface_state.c >> + >> +libisl_gen8_FILES = \ >> + isl_gen8.c \ >> + isl_gen8.h \ >> + isl_surface_state.c >> + >> +libisl_gen9_FILES = \ >> + isl_gen9.c \ >> + isl_gen9.h \ >> + isl_surface_state.c >> + >> +libisl_GENERATED_FILES = \ >> + isl_format_layout.c >> diff --git a/src/mesa/drivers/dri/i965/Android.mk >> b/src/mesa/drivers/dri/i965/Android.mk >> index 9fd3a30..b46d5e3 100644 >> --- a/src/mesa/drivers/dri/i965/Android.mk >> +++ b/src/mesa/drivers/dri/i965/Android.mk >> @@ -45,14 +45,16 @@ LOCAL_CFLAGS += \ >> endif >> >> LOCAL_C_INCLUDES := \ >> - $(MESA_DRI_C_INCLUDES) >> + $(MESA_DRI_C_INCLUDES) \ >> + $(MESA_TOP)/src/intel > > This should not be needed if libisl exports includes. > >> LOCAL_SRC_FILES := \ >> $(i965_compiler_FILES) \ >> $(i965_FILES) >> >> LOCAL_WHOLE_STATIC_LIBRARIES := \ >> - $(MESA_DRI_WHOLE_STATIC_LIBRARIES) >> + $(MESA_DRI_WHOLE_STATIC_LIBRARIES) \ >> + libisl >> >> LOCAL_SHARED_LIBRARIES := \ >> $(MESA_DRI_SHARED_LIBRARIES) \ -- Chih-Wei Android-x86 project http://www.android-x86.org _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev