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

Merge "Revert "Remove DX from the SDK"" am: 4e005d8a1c am: 783a0df53e

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

Change-Id: I1c500ba156de2b2f7f3a618189edc6707fb0af12
This commit is contained in:
Søren Gjesse
2021-04-19 15:20:35 +00:00
committed by Automerger Merge Worker
parent 03aecca430 783a0df53e
commit 08412579dd
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/sdk.atree
View File

@@ -129,7 +129,9 @@ 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
# 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 bin/dexdump build-tools/${PLATFORM_NAME}/dexdump
# d8 # d8

1
sdk/sdk_files_NOTICE.txt
View File

@@ -9738,6 +9738,7 @@ 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