Revert^2 "Add support for dex containers (DEX v41)."
This reverts commit a3b8c73d8ae9943c8aaabf49349302b4c05cea71.
Reason for revert: Reland
Test: ./art/test.py -b --host --optimizing --64
Test: device boots with container dex enabled for framework
Test: tests pass with compax dex re-enabled
Change-Id: I100a796f5105c351a531a45dcbea8b0245f598a8
diff --git a/test/run_test_build.py b/test/run_test_build.py
index e1f6e73..7dfec8a 100755
--- a/test/run_test_build.py
+++ b/test/run_test_build.py
@@ -216,6 +216,7 @@
javac_args=[],
javac_classpath: List[Path]=[],
d8_flags=[],
+ d8_dex_container=True,
smali_args=[],
use_smali=True,
use_jasmin=True,
@@ -305,7 +306,10 @@
# packaged in a jar file.
def make_dex(src_dir: Path):
dst_jar = Path(src_dir.name + ".jar")
- args = d8_flags + ["--min-api", str(api_level), "--output", dst_jar]
+ args = []
+ if d8_dex_container:
+ args += ["-JDcom.android.tools.r8.dexContainerExperiment"]
+ args += d8_flags + ["--min-api", str(api_level), "--output", dst_jar]
args += ["--lib", self.bootclasspath] if use_desugar else ["--no-desugaring"]
args += sorted(src_dir.glob("**/*.class"))
self.d8(args)
@@ -328,7 +332,11 @@
# It is useful to normalize non-deterministic smali output.
tmp_dir = self.test_dir / "dexmerge"
tmp_dir.mkdir()
- self.d8(["--min-api", str(api_level), "--output", tmp_dir] + srcs)
+ flags = []
+ if d8_dex_container:
+ flags += ["-JDcom.android.tools.r8.dexContainerExperiment"]
+ flags += ["--min-api", str(api_level), "--output", tmp_dir]
+ self.d8(flags + srcs)
assert not (tmp_dir / "classes2.dex").exists()
for src_file in srcs:
src_file.unlink()