LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove DX from the SDK" am: a5b6f93ff2 am: a2c173be97

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1681270

Change-Id: I87607925cb4b3d7705d20ae4a8e40e9a358fa964
This commit is contained in:
Søren Gjesse
2021-04-21 10:24:38 +00:00
committed by Automerger Merge Worker
parent 08412579dd a2c173be97
commit 0b05fe7f8f
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/sdk-windows-x86.atree
View File

@@ -104,8 +104,6 @@ tools/apksig/etc/apksigner.bat build-tools/${PLATFORM_NAME}/apksi
rm build-tools/${PLATFORM_NAME}/zipalign rm build-tools/${PLATFORM_NAME}/zipalign
bin/zipalign.exe strip build-tools/${PLATFORM_NAME}/zipalign.exe bin/zipalign.exe strip build-tools/${PLATFORM_NAME}/zipalign.exe
rm build-tools/${PLATFORM_NAME}/dx
dalvik/dx/etc/dx.bat build-tools/${PLATFORM_NAME}/dx.bat
rm build-tools/${PLATFORM_NAME}/dexdump rm build-tools/${PLATFORM_NAME}/dexdump
bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/dexdump.exe bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/dexdump.exe

4
build/sdk.atree
View File

@@ -129,9 +129,7 @@ prebuilts/sdk/renderscript/lib/x86_64/librsrt_x86_64.bc build-tools/${PLATFO
bin/apksigner build-tools/${PLATFORM_NAME}/apksigner bin/apksigner build-tools/${PLATFORM_NAME}/apksigner
framework/apksigner.jar build-tools/${PLATFORM_NAME}/lib/apksigner.jar framework/apksigner.jar build-tools/${PLATFORM_NAME}/lib/apksigner.jar
# dx # dexdump
bin/dx build-tools/${PLATFORM_NAME}/dx
framework/dx.jar build-tools/${PLATFORM_NAME}/lib/dx.jar
bin/dexdump build-tools/${PLATFORM_NAME}/dexdump bin/dexdump build-tools/${PLATFORM_NAME}/dexdump
# d8 # d8

1
sdk/sdk_files_NOTICE.txt
View File

@@ -9738,7 +9738,6 @@ Notices for file(s):
/bin/aapt /bin/aapt
/bin/aidl /bin/aidl
/bin/dexdump /bin/dexdump
/bin/dx
/bin/jasmin /bin/jasmin
/bin/split-select /bin/split-select
/framework/android-mock-generatorlib.jar /framework/android-mock-generatorlib.jar