From 34e933850faaf628273996f4e16772402b5c6df5 Mon Sep 17 00:00:00 2001 From: Rico Wind Date: Wed, 13 May 2020 09:33:25 +0200 Subject: [PATCH] Revert back to using the default r8 jar for buildtools We have never actually updated the buildtools version independently of the normal updates (except updating it to be the same) If we ever need to update it to a seperate version, that is is easily accomplished by changing the path. Bug: b/134507641 Test: m -j55 sdk and run d8 in the sdk zip validating the version Change-Id: Ib1540b22921e10946ec33076f1db40c50bccac76 --- build/sdk.atree | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/sdk.atree b/build/sdk.atree index aa18fcea5..405b51280 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -139,7 +139,7 @@ framework/dx.jar build-tools/${PLATFORM_NAME}/lib/d bin/dexdump build-tools/${PLATFORM_NAME}/dexdump # d8 -prebuilts/r8/buildtools/d8-master.jar build-tools/${PLATFORM_NAME}/lib/d8.jar +prebuilts/r8/r8.jar build-tools/${PLATFORM_NAME}/lib/d8.jar prebuilts/r8/d8 build-tools/${PLATFORM_NAME}/d8 # multi-dex