X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/dab4f215c82efd88da9a23cec859e89130e0f1eb..81299d0c4e158319ea08df3b6358c8bf1b8f099d:/packages/dx/build.sh

diff --git a/packages/dx/build.sh b/packages/dx/build.sh
index d39d13dd..b7af1b62 100755
--- a/packages/dx/build.sh
+++ b/packages/dx/build.sh
@@ -4,10 +4,25 @@ TERMUX_PKG_VERSION=$TERMUX_ANDROID_BUILD_TOOLS_VERSION
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
 termux_step_make_install () {
+	# Rewrite packages to avoid using com.android.* classes which may clash with
+	# classes in the Android runtime on devices (see #1801):
+	local JARJAR=$TERMUX_PKG_CACHEDIR/jarjar.jar
+	local RULEFILE=$TERMUX_PKG_TMPDIR/jarjar-rule.txt
+	local REWRITTEN_DX=$TERMUX_PKG_TMPDIR/dx-rewritten.jar
+	termux_download \
+		http://central.maven.org/maven2/com/googlecode/jarjar/jarjar/1.3/jarjar-1.3.jar \
+		$JARJAR \
+		4225c8ee1bf3079c4b07c76fe03c3e28809a22204db6249c9417efa4f804b3a7
+	echo 'rule com.android.** dx.@1' > $RULEFILE
+	java -jar $JARJAR process $RULEFILE \
+		$ANDROID_HOME/build-tools/${TERMUX_PKG_VERSION}/lib/dx.jar \
+		$REWRITTEN_DX
+
+	# Dex the rewritten jar file:
 	mkdir -p $TERMUX_PREFIX/share/dex
 	$TERMUX_DX --dex \
 		--output $TERMUX_PREFIX/share/dex/dx.dex \
-		$ANDROID_HOME/build-tools/${TERMUX_PKG_VERSION}/lib/dx.jar
+		$REWRITTEN_DX
 
 	install $TERMUX_PKG_BUILDER_DIR/dx $TERMUX_PREFIX/bin/dx
 	perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/dx