From 97c4f4304ae8bde7823c71e3c353b37599f3c69d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Gjesse?= <sgjesse@google.com>
Date: Thu, 15 Apr 2021 18:12:57 +0200
Subject: [PATCH] Remove DX from the SDK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Deprecation and removal of support of DX was announced here:
https://android-developers.googleblog.com/2020/02/the-path-to-dx-deprecation.html.

There is says:

As of On Feb 1st, 2021, we’ll move to step 3, removing DX fully from
Android Studio and any other build environments.

Test: m sdk
Bug: 185479734
Bug: 73711890
Change-Id: I2d7601037ed4135e00cf48b4b9f490a86fec90cb
---
 build/sdk.atree          | 4 +---
 sdk/sdk_files_NOTICE.txt | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/build/sdk.atree b/build/sdk.atree
index e522e5de2..b6d8e257d 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -129,9 +129,7 @@ prebuilts/sdk/renderscript/lib/x86_64/librsrt_x86_64.bc     build-tools/${PLATFO
 bin/apksigner                                 build-tools/${PLATFORM_NAME}/apksigner
 framework/apksigner.jar                       build-tools/${PLATFORM_NAME}/lib/apksigner.jar
 
-# dx
-bin/dx                                        build-tools/${PLATFORM_NAME}/dx
-framework/dx.jar                              build-tools/${PLATFORM_NAME}/lib/dx.jar
+# dexdump
 bin/dexdump                                   build-tools/${PLATFORM_NAME}/dexdump
 
 # d8
diff --git a/sdk/sdk_files_NOTICE.txt b/sdk/sdk_files_NOTICE.txt
index 4bb35b57f..7e9633f78 100644
--- a/sdk/sdk_files_NOTICE.txt
+++ b/sdk/sdk_files_NOTICE.txt
@@ -9738,7 +9738,6 @@ Notices for file(s):
 /bin/aapt
 /bin/aidl
 /bin/dexdump
-/bin/dx
 /bin/jasmin
 /bin/split-select
 /framework/android-mock-generatorlib.jar