Merge "Remove DX from the SDK"

2021-04-19 13:39:34 +00:00
parent 5a81e1cf66 97c4f4304a
commit 5064ab0df2
2 changed files with 1 additions and 4 deletions
--- 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
--- 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