diff --git a/android/Makefile.am b/android/Makefile.am
index f8e6bcd4..7495ed4e 100644
--- a/android/Makefile.am
+++ b/android/Makefile.am
@@ -8,29 +8,23 @@ android_DATA=$(ANDROID_APK)
 # All the DATA files that getinstalled by a normal build.
 # TODO: Would be ideal to infer this list rather than hard-coding it here.  
 DATA_FILES = \
-	bg_paperdol.vga \
 	exult.flx \
 	exult_si.flx \
-	u7bgintrinsics.data \
-	u7opcodes.data \
-	u7siintrinsics.data \
-	bg_mr_faces.vga \
 	exult_bg.flx \
-	exultmsg.txt \
-	midisfx.flx \
-	u7misc.data \
-	u7sibetaintrinsics.data
+	midisfx.flx
 
 # We'll place the data files in the apk's assets folder so that they get bundled into the package.
 APK_ASSETS_DIR=$(abs_builddir)/app/src/main/assets/data
-APK_ASSETS = $(patsubst %,$(APK_ASSETS_DIR)/%,$(DATA_FILES))
+APK_ASSETS = $(DATA_FILES:%=$(APK_ASSETS_DIR)/%)
 
 # Gradle doesn't appear to have a simple way to do out-of-tree builds, so instead we'll symbolic link the source tree
 # into the build directory and run the build from the links.  Note that the final source tree includes elements from
 # multiple locations and we end up installing an assets folder as part of the build in app/src/main/assets which we don't
 # want to end up in the source tree, so we can't simply have one link to the top-level source tree.
 APK_SOURCE_TREE = \
-	$(patsubst $(srcdir)/%,$(abs_builddir)/%,$(wildcard $(srcdir)/*gradle*)) \
+	$(abs_builddir)/build.gradle \
+	$(abs_builddir)/gradle.properties \
+	$(abs_builddir)/settings.gradle \
 	$(abs_builddir)/app/src/main/AndroidManifest.xml \
 	$(abs_builddir)/app/src/main/cpp \
 	$(abs_builddir)/app/src/main/java/info/exult \
@@ -71,22 +65,10 @@ $(abs_builddir)/app/src/main/java/org/libsdl: $(SDL_SOURCE_DIR)
 	@$(MKDIR_P) $(dir $@)
 	$(LN_S) $(SDL_SOURCE_DIR)/android-project/app/src/main/java/org/libsdl $@
 
-$(APK_ASSETS_DIR)/%: $(abs_top_srcdir)/data/bg/%
-	@$(MKDIR_P) $(dir $@)
-	$(INSTALL) $< $@
-
 $(APK_ASSETS_DIR)/%: $(abs_top_srcdir)/data/%
 	@$(MKDIR_P) $(dir $@)
 	$(INSTALL) $< $@
 
-$(APK_ASSETS_DIR)/%: $(abs_top_srcdir)/usecode/ucxt/data/%
-	@$(MKDIR_P) $(dir $@)
-	$(INSTALL) $< $@
-
-$(APK_ASSETS_DIR)/%: $(abs_top_builddir)/usecode/ucxt/data/%
-	@$(MKDIR_P) $(dir $@)
-	$(INSTALL) $< $@
-
 # In addition to building the SDL C library for NDK, we also need Java
 # sources compiled into the app.  Rather than let the NDK CMake pull
 # in SDL like the other dependencies, pre-load the codebase here at