From a62cbeefdf3678bf213b45d163096c641c1d74a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Gjesse?= <sgjesse@google.com>
Date: Mon, 19 Apr 2021 14:26:56 +0000
Subject: [PATCH] Revert "Remove DX from the SDK"

This reverts commit 97c4f4304ae8bde7823c71e3c353b37599f3c69d.

Reason for revert: Build breakage

Change-Id: I24db691da0ff4bfdf95db611928084486183b3a7
---
 build/sdk.atree          | 4 +++-
 sdk/sdk_files_NOTICE.txt | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

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