On Tue, Nov 12, 2013 at 11:50:34AM +0000, oscar.mateo@xxxxxxxxx wrote: > From: Oscar Mateo <oscar.mateo@xxxxxxxxx> > > These patches aim to create an Android build system. This used to exist, but > the old Android.mk files were bit-rotten and therefore kicked out. > > As suggested by Daniel Vetter and Damien Lespiau, as a fist step I extracted > the source files lists into a Makefile.sources which can be included by both > the autoconf files and the Android makefiles. > > Changes since the last submission: > > - Tabs when defining variables are fine, but fix missing "\" (thanks Damien). > - Drop some of the warning fixes and instead fix compilation flags. > - Reword comment and commit message in name conflict with Android's i915_drm.h > - Do not error on return-type (at least until Bionic correctly annotates > "noreturn" on pthread_exit). > > Oscar Mateo (11): > build: list all test/tool/lib source files in their own > Makefile.sources > build: Fix missing "\" in tests/Makefile.sources > build: Move logic to tests/Makefile.am and away from Makefile.sources > lib: Move kms stuff from drmtest.c over to igt_kms.c > rendercopy: Remove rendercopy.c > tests/drm_get_client_auth: In Android, use gettid() instead of > syscall(SYS_gettid) > tests/gem_vmap_blits: Finish extracting gem_read > build: Fix assorted compilation warnings > lib/drmtest: Get the correct basename() under Android > lib/igt_display: workaround a name conflict in Android > build: New Android makefiles All slurped in, thanks for the patches. The igt_kms extraction needed two small fixes to make it work, but I've frobbed that while applying. -Daniel > > Android.mk | 530 +----------------------------- > lib/Makefile.am | 38 +-- > lib/Makefile.sources | 37 +++ > lib/drmtest.c | 744 +---------------------------------------- > lib/drmtest.h | 76 +---- > lib/igt_display.h | 4 + > lib/igt_kms.c | 764 +++++++++++++++++++++++++++++++++++++++++++ > lib/igt_kms.h | 102 ++++++ > lib/intel_batchbuffer.h | 2 +- > lib/intel_gpu_tools.h | 2 +- > lib/intel_reg_map.c | 4 +- > lib/rendercopy.c | 49 --- > lib/rendercopy.h | 2 - > tests/Android.mk | 77 +++++ > tests/Makefile.am | 206 +----------- > tests/Makefile.sources | 203 ++++++++++++ > tests/drm_get_client_auth.c | 10 +- > tests/gem_render_copy.c | 21 ++ > tests/gem_vmap_blits.c | 14 - > tests/kms_cursor_crc.c | 1 + > tests/kms_flip.c | 1 + > tests/kms_pipe_crc_basic.c | 1 + > tests/kms_render.c | 1 + > tests/kms_setmode.c | 1 + > tests/pm_pc8.c | 1 + > tests/testdisplay.c | 1 + > tools/Android.mk | 70 ++++ > tools/Makefile.am | 54 +-- > tools/Makefile.sources | 53 +++ > 29 files changed, 1369 insertions(+), 1700 deletions(-) > create mode 100644 lib/Makefile.sources > create mode 100644 lib/igt_kms.c > create mode 100644 lib/igt_kms.h > delete mode 100644 lib/rendercopy.c > create mode 100644 tests/Android.mk > create mode 100644 tests/Makefile.sources > create mode 100644 tools/Android.mk > create mode 100644 tools/Makefile.sources > > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
