Merge "Support v41 DEX version for dexdeps." into main am: 1bed4bab8b am: e5ed58210b am: f075e91770 am: 055d459012

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2902247

Change-Id: Ib280382068e92740f224aba666316c4e93a24440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/dx/BUILD b/dx/BUILD
new file mode 100644
index 0000000..3ea35f5
--- /dev/null
+++ b/dx/BUILD
@@ -0,0 +1,25 @@
+# Bazel (https://bazel.io/) BUILD file for dex.
+licenses(["notice"])  # Apache License 2.0
+
+java_library(
+    name = "dx",
+    srcs = glob([
+        "src/**/*.java",
+    ]),
+    javacopts = ["-Xep:MissingCasesInEnumSwitch:WARN"],
+    visibility = ["//tools/base/build-system/builder:__pkg__"],
+)
+
+java_test(
+    name = "dx_tests",
+    srcs = glob([
+        "junit-tests/**/*.java",
+    ]),
+    jvm_flags = ["-Dtest.suite.jar=dx_tests.jar"],
+    test_class = "com.android.testutils.JarTestSuite",
+    deps = [
+        ":dx",
+        "//tools/base/testutils:tools.testutils",
+        "//tools/base/third_party:junit_junit",
+    ],
+)
diff --git a/dx/android.sdktools.dx.iml b/dx/android.sdktools.dx.iml
new file mode 100644
index 0000000..8cfc261
--- /dev/null
+++ b/dx/android.sdktools.dx.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/junit-tests" isTestSource="true" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+  </component>
+</module>
diff --git a/dx/build.gradle b/dx/build.gradle
new file mode 100644
index 0000000..ed3f620
--- /dev/null
+++ b/dx/build.gradle
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+apply plugin: 'com.android.tools.java-library'
+
+sourceSets {
+    main {
+        java {
+            srcDirs 'src'
+        }
+    }
+    test {
+        java {
+            srcDirs 'junit-tests'
+        }
+    }
+}
+
+dependencies {
+    testCompile libs.junit
+}
diff --git a/dx/tests/030-minimal-jasmin/BUILD.bazel b/dx/tests/030-minimal-jasmin/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/030-minimal-jasmin/BUILD.bazel
diff --git a/dx/tests/031-bb-dead-code/BUILD.bazel b/dx/tests/031-bb-dead-code/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/031-bb-dead-code/BUILD.bazel
diff --git a/dx/tests/032-bb-live-code/BUILD.bazel b/dx/tests/032-bb-live-code/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/032-bb-live-code/BUILD.bazel
diff --git a/dx/tests/034-dex-minimal/BUILD.bazel b/dx/tests/034-dex-minimal/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/034-dex-minimal/BUILD.bazel
diff --git a/dx/tests/035-dex-instance-var/BUILD.bazel b/dx/tests/035-dex-instance-var/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/035-dex-instance-var/BUILD.bazel
diff --git a/dx/tests/036-dex-static-var/BUILD.bazel b/dx/tests/036-dex-static-var/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/036-dex-static-var/BUILD.bazel
diff --git a/dx/tests/037-dex-static-final-var/BUILD.bazel b/dx/tests/037-dex-static-final-var/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/037-dex-static-final-var/BUILD.bazel
diff --git a/dx/tests/038-dex-instance-method/BUILD.bazel b/dx/tests/038-dex-instance-method/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/038-dex-instance-method/BUILD.bazel
diff --git a/dx/tests/039-dex-static-method/BUILD.bazel b/dx/tests/039-dex-static-method/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/039-dex-static-method/BUILD.bazel
diff --git a/dx/tests/040-dex-constructor/BUILD.bazel b/dx/tests/040-dex-constructor/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/040-dex-constructor/BUILD.bazel
diff --git a/dx/tests/041-dex-abstract-method/BUILD.bazel b/dx/tests/041-dex-abstract-method/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/041-dex-abstract-method/BUILD.bazel
diff --git a/dx/tests/042-dex-ignore-result/BUILD.bazel b/dx/tests/042-dex-ignore-result/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/042-dex-ignore-result/BUILD.bazel
diff --git a/dx/tests/043-dex-two-classes/BUILD.bazel b/dx/tests/043-dex-two-classes/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/043-dex-two-classes/BUILD.bazel
diff --git a/dx/tests/044-dex-math-ops/BUILD.bazel b/dx/tests/044-dex-math-ops/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/044-dex-math-ops/BUILD.bazel
diff --git a/dx/tests/045-dex-switch-ops/BUILD.bazel b/dx/tests/045-dex-switch-ops/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/045-dex-switch-ops/BUILD.bazel
diff --git a/dx/tests/046-dex-exceptions/BUILD.bazel b/dx/tests/046-dex-exceptions/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/046-dex-exceptions/BUILD.bazel
diff --git a/dx/tests/047-dex-wide-args/BUILD.bazel b/dx/tests/047-dex-wide-args/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/047-dex-wide-args/BUILD.bazel
diff --git a/dx/tests/048-dex-new-array/BUILD.bazel b/dx/tests/048-dex-new-array/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/048-dex-new-array/BUILD.bazel
diff --git a/dx/tests/049-dex-instanceof/BUILD.bazel b/dx/tests/049-dex-instanceof/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/049-dex-instanceof/BUILD.bazel
diff --git a/dx/tests/050-dex-checkcast/BUILD.bazel b/dx/tests/050-dex-checkcast/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/050-dex-checkcast/BUILD.bazel
diff --git a/dx/tests/051-dex-explicit-null/BUILD.bazel b/dx/tests/051-dex-explicit-null/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/051-dex-explicit-null/BUILD.bazel
diff --git a/dx/tests/052-dex-static-var-access/BUILD.bazel b/dx/tests/052-dex-static-var-access/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/052-dex-static-var-access/BUILD.bazel
diff --git a/dx/tests/053-dex-instance-var-access/BUILD.bazel b/dx/tests/053-dex-instance-var-access/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/053-dex-instance-var-access/BUILD.bazel
diff --git a/dx/tests/054-dex-high16/BUILD.bazel b/dx/tests/054-dex-high16/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/054-dex-high16/BUILD.bazel
diff --git a/dx/tests/055-dex-explicit-throw/BUILD.bazel b/dx/tests/055-dex-explicit-throw/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/055-dex-explicit-throw/BUILD.bazel
diff --git a/dx/tests/056-dex-call-interface/BUILD.bazel b/dx/tests/056-dex-call-interface/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/056-dex-call-interface/BUILD.bazel
diff --git a/dx/tests/057-dex-call-virtual/BUILD.bazel b/dx/tests/057-dex-call-virtual/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/057-dex-call-virtual/BUILD.bazel
diff --git a/dx/tests/058-dex-call-direct/BUILD.bazel b/dx/tests/058-dex-call-direct/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/058-dex-call-direct/BUILD.bazel
diff --git a/dx/tests/059-dex-call-super/BUILD.bazel b/dx/tests/059-dex-call-super/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/059-dex-call-super/BUILD.bazel
diff --git a/dx/tests/060-dex-call-static/BUILD.bazel b/dx/tests/060-dex-call-static/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/060-dex-call-static/BUILD.bazel
diff --git a/dx/tests/061-dex-try-catch/BUILD.bazel b/dx/tests/061-dex-try-catch/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/061-dex-try-catch/BUILD.bazel
diff --git a/dx/tests/062-dex-synch-method/BUILD.bazel b/dx/tests/062-dex-synch-method/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/062-dex-synch-method/BUILD.bazel
diff --git a/dx/tests/063-dex-empty-switch/BUILD.bazel b/dx/tests/063-dex-empty-switch/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/063-dex-empty-switch/BUILD.bazel
diff --git a/dx/tests/064-dex-array-access/BUILD.bazel b/dx/tests/064-dex-array-access/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/064-dex-array-access/BUILD.bazel
diff --git a/dx/tests/065-dex-new-array/BUILD.bazel b/dx/tests/065-dex-new-array/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/065-dex-new-array/BUILD.bazel
diff --git a/dx/tests/066-dex-try-catch-rethrow/BUILD.bazel b/dx/tests/066-dex-try-catch-rethrow/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/066-dex-try-catch-rethrow/BUILD.bazel
diff --git a/dx/tests/067-dex-switch-and-try/BUILD.bazel b/dx/tests/067-dex-switch-and-try/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/067-dex-switch-and-try/BUILD.bazel
diff --git a/dx/tests/068-dex-infinite-loop/BUILD.bazel b/dx/tests/068-dex-infinite-loop/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/068-dex-infinite-loop/BUILD.bazel
diff --git a/dx/tests/069-dex-source-position/BUILD.bazel b/dx/tests/069-dex-source-position/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/069-dex-source-position/BUILD.bazel
diff --git a/dx/tests/070-dex-multianewarray/BUILD.bazel b/dx/tests/070-dex-multianewarray/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/070-dex-multianewarray/BUILD.bazel
diff --git a/dx/tests/071-dex-java-stack-ops/BUILD.bazel b/dx/tests/071-dex-java-stack-ops/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/071-dex-java-stack-ops/BUILD.bazel
diff --git a/dx/tests/072-dex-switch-edge-cases/BUILD.bazel b/dx/tests/072-dex-switch-edge-cases/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/072-dex-switch-edge-cases/BUILD.bazel
diff --git a/dx/tests/073-dex-null-array-refs/BUILD.bazel b/dx/tests/073-dex-null-array-refs/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/073-dex-null-array-refs/BUILD.bazel
diff --git a/dx/tests/074-dex-form35c-edge-case/BUILD.bazel b/dx/tests/074-dex-form35c-edge-case/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/074-dex-form35c-edge-case/BUILD.bazel
diff --git a/dx/tests/075-dex-cat2-value-merge/BUILD.bazel b/dx/tests/075-dex-cat2-value-merge/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/075-dex-cat2-value-merge/BUILD.bazel
diff --git a/dx/tests/076-dex-synch-and-stack/BUILD.bazel b/dx/tests/076-dex-synch-and-stack/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/076-dex-synch-and-stack/BUILD.bazel
diff --git a/dx/tests/077-dex-code-alignment/BUILD.bazel b/dx/tests/077-dex-code-alignment/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/077-dex-code-alignment/BUILD.bazel
diff --git a/dx/tests/078-dex-local-variable-table/BUILD.bazel b/dx/tests/078-dex-local-variable-table/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/078-dex-local-variable-table/BUILD.bazel
diff --git a/dx/tests/079-dex-local-variable-renumbering/BUILD.bazel b/dx/tests/079-dex-local-variable-renumbering/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/079-dex-local-variable-renumbering/BUILD.bazel
diff --git a/dx/tests/080-dex-exception-tables/BUILD.bazel b/dx/tests/080-dex-exception-tables/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/080-dex-exception-tables/BUILD.bazel
diff --git a/dx/tests/081-dex-throws-list/BUILD.bazel b/dx/tests/081-dex-throws-list/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/081-dex-throws-list/BUILD.bazel
diff --git a/dx/tests/082-dex-throws-list-sharing/BUILD.bazel b/dx/tests/082-dex-throws-list-sharing/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/082-dex-throws-list-sharing/BUILD.bazel
diff --git a/dx/tests/083-ssa-phi-placement/BUILD.bazel b/dx/tests/083-ssa-phi-placement/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/083-ssa-phi-placement/BUILD.bazel
diff --git a/dx/tests/084-dex-high-register-moves/BUILD.bazel b/dx/tests/084-dex-high-register-moves/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/084-dex-high-register-moves/BUILD.bazel
diff --git a/dx/tests/085-dex-jsr-ret/BUILD.bazel b/dx/tests/085-dex-jsr-ret/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/085-dex-jsr-ret/BUILD.bazel
diff --git a/dx/tests/086-ssa-edge-split/BUILD.bazel b/dx/tests/086-ssa-edge-split/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/086-ssa-edge-split/BUILD.bazel
diff --git a/dx/tests/087-ssa-local-vars/BUILD.bazel b/dx/tests/087-ssa-local-vars/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/087-ssa-local-vars/BUILD.bazel
diff --git a/dx/tests/088-ssa-combine-blocks/BUILD.bazel b/dx/tests/088-ssa-combine-blocks/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/088-ssa-combine-blocks/BUILD.bazel
diff --git a/dx/tests/089-dex-define-object/BUILD.bazel b/dx/tests/089-dex-define-object/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/089-dex-define-object/BUILD.bazel
diff --git a/dx/tests/090-dex-unify-arrays/BUILD.bazel b/dx/tests/090-dex-unify-arrays/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/090-dex-unify-arrays/BUILD.bazel
diff --git a/dx/tests/091-ssa-const-collector/BUILD.bazel b/dx/tests/091-ssa-const-collector/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/091-ssa-const-collector/BUILD.bazel
diff --git a/dx/tests/092-ssa-cfg-edge-cases/BUILD.bazel b/dx/tests/092-ssa-cfg-edge-cases/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/092-ssa-cfg-edge-cases/BUILD.bazel
diff --git a/dx/tests/093-ssa-invoke-range/BUILD.bazel b/dx/tests/093-ssa-invoke-range/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/093-ssa-invoke-range/BUILD.bazel
diff --git a/dx/tests/094-scala-locals/BUILD.bazel b/dx/tests/094-scala-locals/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/094-scala-locals/BUILD.bazel
diff --git a/dx/tests/096-dex-giant-catch/BUILD.bazel b/dx/tests/096-dex-giant-catch/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/096-dex-giant-catch/BUILD.bazel
diff --git a/dx/tests/097-dex-branch-offset-zero/BUILD.bazel b/dx/tests/097-dex-branch-offset-zero/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/097-dex-branch-offset-zero/BUILD.bazel
diff --git a/dx/tests/099-dex-core-library-error/BUILD.bazel b/dx/tests/099-dex-core-library-error/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/099-dex-core-library-error/BUILD.bazel
diff --git a/dx/tests/100-local-mismatch/BUILD.bazel b/dx/tests/100-local-mismatch/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/100-local-mismatch/BUILD.bazel
diff --git a/dx/tests/101-verify-wide-math/BUILD.bazel b/dx/tests/101-verify-wide-math/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/101-verify-wide-math/BUILD.bazel
diff --git a/dx/tests/102-verify-nonwide-math/BUILD.bazel b/dx/tests/102-verify-nonwide-math/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/102-verify-nonwide-math/BUILD.bazel
diff --git a/dx/tests/103-verify-branch-ops/BUILD.bazel b/dx/tests/103-verify-branch-ops/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/103-verify-branch-ops/BUILD.bazel
diff --git a/dx/tests/104-verify-return-ops/BUILD.bazel b/dx/tests/104-verify-return-ops/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/104-verify-return-ops/BUILD.bazel
diff --git a/dx/tests/105-verify-load-store-ops/BUILD.bazel b/dx/tests/105-verify-load-store-ops/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/105-verify-load-store-ops/BUILD.bazel
diff --git a/dx/tests/106-verify-object-ops/BUILD.bazel b/dx/tests/106-verify-object-ops/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/106-verify-object-ops/BUILD.bazel
diff --git a/dx/tests/107-verify-stack-ops/BUILD.bazel b/dx/tests/107-verify-stack-ops/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/107-verify-stack-ops/BUILD.bazel
diff --git a/dx/tests/108-string-annotation/BUILD.bazel b/dx/tests/108-string-annotation/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/108-string-annotation/BUILD.bazel
diff --git a/dx/tests/109-int-branch/BUILD.bazel b/dx/tests/109-int-branch/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/109-int-branch/BUILD.bazel
diff --git a/dx/tests/110-dex-preserve-this/BUILD.bazel b/dx/tests/110-dex-preserve-this/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/110-dex-preserve-this/BUILD.bazel
diff --git a/dx/tests/111-use-null-as-array/BUILD.bazel b/dx/tests/111-use-null-as-array/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/111-use-null-as-array/BUILD.bazel
diff --git a/dx/tests/112-dex-return-jsr-result/BUILD.bazel b/dx/tests/112-dex-return-jsr-result/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/112-dex-return-jsr-result/BUILD.bazel
diff --git a/dx/tests/113-old-style-inner-class/BUILD.bazel b/dx/tests/113-old-style-inner-class/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/113-old-style-inner-class/BUILD.bazel
diff --git a/dx/tests/114-value-propagation/BUILD.bazel b/dx/tests/114-value-propagation/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/114-value-propagation/BUILD.bazel
diff --git a/dx/tests/115-merge/BUILD.bazel b/dx/tests/115-merge/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/115-merge/BUILD.bazel
diff --git a/dx/tests/116-leb128/BUILD.bazel b/dx/tests/116-leb128/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/116-leb128/BUILD.bazel
diff --git a/dx/tests/117-modified-utf8/BUILD.bazel b/dx/tests/117-modified-utf8/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/117-modified-utf8/BUILD.bazel
diff --git a/dx/tests/118-find-usages/BUILD.bazel b/dx/tests/118-find-usages/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/118-find-usages/BUILD.bazel
diff --git a/dx/tests/119-merge-conflict/BUILD.bazel b/dx/tests/119-merge-conflict/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/119-merge-conflict/BUILD.bazel
diff --git a/dx/tests/121-sccp/BUILD.bazel b/dx/tests/121-sccp/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/121-sccp/BUILD.bazel
diff --git a/dx/tests/122-switch-with-high-register/BUILD.bazel b/dx/tests/122-switch-with-high-register/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/122-switch-with-high-register/BUILD.bazel
diff --git a/dx/tests/125-main-dex-list/BUILD.bazel b/dx/tests/125-main-dex-list/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/125-main-dex-list/BUILD.bazel
diff --git a/dx/tests/126-main-dex-list-one-dex/BUILD.bazel b/dx/tests/126-main-dex-list-one-dex/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/126-main-dex-list-one-dex/BUILD.bazel
diff --git a/dx/tests/127-merge-stress/BUILD.bazel b/dx/tests/127-merge-stress/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/127-merge-stress/BUILD.bazel
diff --git a/dx/tests/128-multidex-option-overflow/BUILD.bazel b/dx/tests/128-multidex-option-overflow/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/128-multidex-option-overflow/BUILD.bazel
diff --git a/dx/tests/132-invoke-polymorphic/BUILD.bazel b/dx/tests/132-invoke-polymorphic/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/132-invoke-polymorphic/BUILD.bazel
diff --git a/dx/tests/134-maindexlist-lambdas/BUILD.bazel b/dx/tests/134-maindexlist-lambdas/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/134-maindexlist-lambdas/BUILD.bazel
diff --git a/dx/tests/135-invoke-custom/BUILD.bazel b/dx/tests/135-invoke-custom/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/135-invoke-custom/BUILD.bazel
diff --git a/dx/tests/136-null-constant-debug-info/BUILD.bazel b/dx/tests/136-null-constant-debug-info/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/136-null-constant-debug-info/BUILD.bazel
diff --git a/dx/tests/137-dexmerger-dex38/BUILD.bazel b/dx/tests/137-dexmerger-dex38/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/137-dexmerger-dex38/BUILD.bazel
diff --git a/dx/tests/138-invoke-polymorphic-again/BUILD.bazel b/dx/tests/138-invoke-polymorphic-again/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/138-invoke-polymorphic-again/BUILD.bazel
diff --git a/dx/tests/139-lambda-metafactory/BUILD.bazel b/dx/tests/139-lambda-metafactory/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/139-lambda-metafactory/BUILD.bazel
diff --git a/dx/tests/140-ssa-phi-overlap/BUILD.bazel b/dx/tests/140-ssa-phi-overlap/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/140-ssa-phi-overlap/BUILD.bazel
diff --git a/dx/tests/141-invoke-polymorphic-varhandles/BUILD.bazel b/dx/tests/141-invoke-polymorphic-varhandles/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/141-invoke-polymorphic-varhandles/BUILD.bazel
diff --git a/dx/tests/142-const-method-handle/BUILD.bazel b/dx/tests/142-const-method-handle/BUILD.bazel
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dx/tests/142-const-method-handle/BUILD.bazel