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.
Test: b build build/bazel/examples/android_app/java/com/app --fat_apk_cpu=k8
Change-Id: Ide59e28b1c942b3b555bb2d48d16b00a17a8ad5d
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"],
)