commit 85e0140514bb8ecdcb1356d49364f423bc4c7ffb
author Romain Jobredeaux <jobredeaux@google.com> Thu Jul 22 13:10:19 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 22 13:10:19 2021 +0000
tree 745c5b65383554aaab8b0120fd9e7745c1824f62
parent 15a0eaea74b6bef84de5f6cc29a9356015dd29a4
parent 63030ba24c9ef23d1f4e617f8309f5a05da04b7c

Merge "Update stale bazel paths to dx/dx.jar. Overwrite dx, dx.jar file unders tools/, tools/lib respectively, to the version that used to live under tools/linux/bin, tools/linux/lib respectively."

BUILD.bazel

diff --git a/BUILD.bazel b/BUILD.bazel
index f1e7c8c..4d273e4 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -8,7 +8,7 @@
     aidl = "//prebuilts/sdk/tools:linux/bin/aidl",
     android_jar = "30/public/android.jar",
     apksigner = ":apksigner",
-    dx = "//prebuilts/sdk/tools:linux/bin/dx",  # TODO: add D8
+    dx = "//prebuilts/sdk/tools:dx",  # TODO: add D8
     framework_aidl = "30/public/framework.aidl",
     main_dex_classes = "//prebuilts/sdk/tools:mainDexClasses.rules",
     main_dex_list_creator = ":fail",
@@ -20,7 +20,7 @@
 
 java_import(
     name = "dx_jar_import",
-    jars = ["//prebuilts/sdk/tools:linux/lib/dx.jar"],
+    jars = ["//prebuilts/sdk/tools:lib/dx.jar"],
     visibility = ["//visibility:public"],
 )
 

tools/BUILD.bazel

diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel
index be231b7..ab591ff 100644
--- a/tools/BUILD.bazel
+++ b/tools/BUILD.bazel
@@ -2,8 +2,8 @@
     [
         "linux/bin/aapt",
         "linux/bin/aapt2",
-        "linux/lib/dx.jar",
-        "linux/bin/dx",
+        "lib/dx.jar",
+        "dx",
         "linux/bin/aidl",
         "linux/bin/zipalign",
         "mainDexClasses.rules",

tools/dx

diff --git a/tools/dx b/tools/dx
old mode 100755
new mode 100644

tools/lib/dx.jar

diff --git a/tools/lib/dx.jar b/tools/lib/dx.jar
index 8f688cd..ef90a14 100644
--- a/tools/lib/dx.jar
+++ b/tools/lib/dx.jar
Binary files differ