Remove dependency on dx and corresponding scripts and gitignore
Bug: 185205222
Change-Id: Ib01e63a8ecadcbfd0455073ed289ee191c3f120b
diff --git a/.gitignore b/.gitignore
index 13e30c3..a010b23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -295,7 +295,5 @@
tools/*/dalvik-4.0.4
tools/*/dalvik-4.0.4.tar.gz
tools/*/dalvik.tar.gz
-tools/*/dx
-tools/*/dx.tar.gz
tools/startup/__pycache__
venv/
diff --git a/build.gradle b/build.gradle
index 3725a13..280db74 100644
--- a/build.gradle
+++ b/build.gradle
@@ -395,7 +395,6 @@
"linux/host/art-master",
"linux/dalvik",
"linux/dalvik-4.0.4",
- "${osString}/dx",
]
]
@@ -507,16 +506,6 @@
}
}
-task downloadDx {
- cloudDependencies.each { entry ->
- entry.value.each { entryFile ->
- if (entryFile.endsWith("/dx")) {
- dependsOn "${getDownloadDepsTaskName(entry.key, entryFile)}"
- }
- }
- }
-}
-
task downloadAndroidCts {
cloudDependencies.each { entry ->
entry.value.each { entryFile ->
diff --git a/scripts/update-host-dx.sh b/scripts/update-host-dx.sh
deleted file mode 100755
index 6d4a3a8..0000000
--- a/scripts/update-host-dx.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/bash
-# Copyright (c) 2016, the R8 project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# This script will update the host dx and dexmerger tools in tools/linux/dx.
-
-# Before running this script make sure the dx and dexmerger versions required are built
-# in ~/android/master (There are probably simpler ways to just build dx and dexmerger):
-#
-# m -j24 build-art
-#
-# Maybe also run the Art host tests:
-#
-# mm -j24 art-test-host
-#
-
-ANDROID_CHECKOUT=~/android/master
-ANDROID_HOST_BUILD=$ANDROID_CHECKOUT/out/host/linux-x86
-LINUX_TOOLS=tools/linux
-DX_DIR=dx
-DEST=$LINUX_TOOLS/$DX_DIR
-
-# Clean out the previous version of Art
-rm -rf $DEST
-
-# Required binaries and scripts.
-mkdir -p $DEST/bin
-cp $ANDROID_HOST_BUILD/bin/dx $DEST/bin
-cp $ANDROID_HOST_BUILD/bin/dexmerger $DEST/bin
-
-# Required framework files.
-mkdir -p $DEST/framework
-cp $ANDROID_HOST_BUILD/framework/dx.jar $DEST/framework
-
-# Build the tar to upload to Google Cloud Storage.
-DX_ARCHIVE=$DX_DIR.tar.gz
-pushd $LINUX_TOOLS > /dev/null
-rm -f $DX_ARCHIVE
-rm -f $DX_ARCHIVE.sha1
-tar caf $DX_ARCHIVE $DX_DIR
-popd > /dev/null
-
-echo "New $LINUX_TOOLS/$DX_ARCHIVE archive created."
-echo ""
-echo "Now run:"
-echo ""
-echo " cd $LINUX_TOOLS"
-echo " upload_to_google_storage.py --bucket r8-deps $DX_DIR.tar.gz"
-echo ""
-echo "to upload to Google Cloud Storage"
