gallium: Remove Android files from distribution.

Android builds Mesa from git, so there don't need to be in the tarball.

20 files changed, 12 insertions, 27 deletions

diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index d9462cb116e..07d26684e7e 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -115,7 +115,6 @@ EXTRA_DIST = \
 	docs \
 	README.portability \
 	SConscript \
-	winsys/sw/android \
 	winsys/sw/gdi \
 	winsys/sw/hgl
 
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index dda51004e2f..1053ce4ee1a 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -74,7 +74,7 @@ libgalliumvl_la_SOURCES = \
 endif
 
 EXTRA_DIST = \
-	Android.mk SConscript \
+	SConscript \
 	indices/u_indices.c \
 	indices/u_unfilled_indices.c \
 	indices/u_indices_gen.py \
diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
index df00add1cb0..aae2a2458ed 100644
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -29,5 +29,3 @@ ir3_compiler_LDADD = \
 	$(top_builddir)/src/util/libmesautil.la \
 	$(GALLIUM_COMMON_LIB_DEPS) \
 	$(FREEDRENO_LIBS)
-
-EXTRA_DIST = Android.mk
diff --git a/src/gallium/drivers/i915/Makefile.am b/src/gallium/drivers/i915/Makefile.am
index 7480df6ee51..eb3c964a37b 100644
--- a/src/gallium/drivers/i915/Makefile.am
+++ b/src/gallium/drivers/i915/Makefile.am
@@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libi915.la
 
 libi915_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = Android.mk TODO
+EXTRA_DIST = TODO
diff --git a/src/gallium/drivers/ilo/Makefile.am b/src/gallium/drivers/ilo/Makefile.am
index 8a29ce4bb83..a8785a5e8c4 100644
--- a/src/gallium/drivers/ilo/Makefile.am
+++ b/src/gallium/drivers/ilo/Makefile.am
@@ -33,5 +33,3 @@ noinst_HEADERS = $(GENHW_FILES)
 noinst_LTLIBRARIES = libilo.la
 
 libilo_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = Android.mk
diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am
index 898606b97ca..0aefc031210 100644
--- a/src/gallium/drivers/nouveau/Makefile.am
+++ b/src/gallium/drivers/nouveau/Makefile.am
@@ -52,4 +52,4 @@ nouveau_compiler_LDADD = \
 	$(top_builddir)/src/util/libmesautil.la \
 	$(GALLIUM_COMMON_LIB_DEPS)
 
-EXTRA_DIST = Android.mk codegen/lib nvc0/mme
+EXTRA_DIST = codegen/lib nvc0/mme
diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index ead7a871977..dd1a5ede19b 100644
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -28,6 +28,6 @@ r300_compiler_tests_SOURCES = $(COMPILER_TESTS_SOURCES)
 
 libr300_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = Android.mk \
+EXTRA_DIST = \
 	compiler/tests/omod_two_writers.test \
 	compiler/tests/regalloc_tex_1d_swizzle.test
diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
index f776410765c..dc0d90d759b 100644
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -38,6 +38,6 @@ AM_CFLAGS += \
 	-DHAVE_OPENCL
 endif
 
-EXTRA_DIST = Android.mk \
+EXTRA_DIST = \
 	sb/notes.markdown \
 	sb/sb_bc_fmt_def.inc
diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
index 3855eb06d9e..ef6b999dd43 100644
--- a/src/gallium/drivers/radeon/Makefile.am
+++ b/src/gallium/drivers/radeon/Makefile.am
@@ -29,5 +29,5 @@ libradeon_la_LDFLAGS = \
 
 endif
 
-EXTRA_DIST = Android.mk \
+EXTRA_DIST = \
 	LLVM_REVISION.txt
diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
index dd543baedf4..aa79c5e01ef 100644
--- a/src/gallium/drivers/radeonsi/Makefile.am
+++ b/src/gallium/drivers/radeonsi/Makefile.am
@@ -31,5 +31,3 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libradeonsi.la
 
 libradeonsi_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = Android.mk
diff --git a/src/gallium/drivers/softpipe/Makefile.am b/src/gallium/drivers/softpipe/Makefile.am
index aadd21f3aea..20f11f8dd2d 100644
--- a/src/gallium/drivers/softpipe/Makefile.am
+++ b/src/gallium/drivers/softpipe/Makefile.am
@@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libsoftpipe.la
 
 libsoftpipe_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = Android.mk SConscript
+EXTRA_DIST = SConscript
diff --git a/src/gallium/drivers/svga/Makefile.am b/src/gallium/drivers/svga/Makefile.am
index 138a84f3c3b..50d44cff84a 100644
--- a/src/gallium/drivers/svga/Makefile.am
+++ b/src/gallium/drivers/svga/Makefile.am
@@ -36,6 +36,6 @@ noinst_LTLIBRARIES = libsvga.la
 
 libsvga_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = Android.mk SConscript \
+EXTRA_DIST = SConscript \
 	include/README \
 	svgadump/svga_dump.py
diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am
index 216bcdbaead..31546a778cf 100644
--- a/src/gallium/state_trackers/egl/Makefile.am
+++ b/src/gallium/state_trackers/egl/Makefile.am
@@ -106,5 +106,5 @@ AM_CPPFLAGS += \
 endif
 
 EXTRA_DIST = \
-	Android.mk SConscript \
+	SConscript \
 	$(android_FILES) $(gdi_FILES)
diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index fb2e570f272..85f2ac1b785 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -155,7 +155,7 @@ egl_gallium_la_LIBADD += \
 endif
 
 EXTRA_egl_gallium_la_DEPENDENCIES = egl.sym
-EXTRA_DIST = Android.mk SConscript
+EXTRA_DIST = SConscript
 
 #if HAVE_GALLIUM_STATIC_TARGETS
 
diff --git a/src/gallium/winsys/freedreno/drm/Makefile.am b/src/gallium/winsys/freedreno/drm/Makefile.am
index d08778f0bea..cf4c24cb81c 100644
--- a/src/gallium/winsys/freedreno/drm/Makefile.am
+++ b/src/gallium/winsys/freedreno/drm/Makefile.am
@@ -31,5 +31,3 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libfreedrenodrm.la
 
 libfreedrenodrm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = Android.mk
diff --git a/src/gallium/winsys/i915/drm/Makefile.am b/src/gallium/winsys/i915/drm/Makefile.am
index 3201d6f9341..82c477d68b6 100644
--- a/src/gallium/winsys/i915/drm/Makefile.am
+++ b/src/gallium/winsys/i915/drm/Makefile.am
@@ -31,5 +31,3 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libi915drm.la
 
 libi915drm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = Android.mk
diff --git a/src/gallium/winsys/intel/drm/Makefile.am b/src/gallium/winsys/intel/drm/Makefile.am
index 088d1a3f41f..fbe1ceaeb1e 100644
--- a/src/gallium/winsys/intel/drm/Makefile.am
+++ b/src/gallium/winsys/intel/drm/Makefile.am
@@ -32,5 +32,3 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libintelwinsys.la
 
 libintelwinsys_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = Android.mk
diff --git a/src/gallium/winsys/nouveau/drm/Makefile.am b/src/gallium/winsys/nouveau/drm/Makefile.am
index c8a8ded7fb0..9c94ea48191 100644
--- a/src/gallium/winsys/nouveau/drm/Makefile.am
+++ b/src/gallium/winsys/nouveau/drm/Makefile.am
@@ -31,5 +31,3 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libnouveaudrm.la
 
 libnouveaudrm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = Android.mk
diff --git a/src/gallium/winsys/radeon/drm/Makefile.am b/src/gallium/winsys/radeon/drm/Makefile.am
index 0a913194eb8..0320aca01f9 100644
--- a/src/gallium/winsys/radeon/drm/Makefile.am
+++ b/src/gallium/winsys/radeon/drm/Makefile.am
@@ -9,4 +9,4 @@ noinst_LTLIBRARIES = libradeonwinsys.la
 
 libradeonwinsys_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = $(TOOLS_HDR) Android.mk
+EXTRA_DIST = $(TOOLS_HDR)
diff --git a/src/gallium/winsys/svga/drm/Makefile.am b/src/gallium/winsys/svga/drm/Makefile.am
index 3b95b47efca..dfa97367650 100644
--- a/src/gallium/winsys/svga/drm/Makefile.am
+++ b/src/gallium/winsys/svga/drm/Makefile.am
@@ -36,4 +36,4 @@ noinst_LTLIBRARIES = libsvgadrm.la
 
 libsvgadrm_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = Android.mk SConscript
+EXTRA_DIST = SConscript