Revert "Fix CompilerDriver's handling of boot image extension."
This reverts commit 96491e9db22806d4343ddcbca97083127b728e0a.
Reason for revert: Breaks the local ART build with the master-art
manifest with these errors:
[ 99% 1543/1544] target dex2oat: out/target/product/armv8/data/art-test/arm64/core-interpreter.art
FAILED: out/target/product/armv8/data/art-test/arm64/core-interpreter.art
[…]
dex2oatd W 11-18 18:14:42 119587 119587 class_linker.cc:4711] Rejecting class com.android.org.conscrypt.AbstractConscryptEngine that attempts to sub-type erroneous class javax.net.ssl.SSLEngine in /system/framework/conscrypt-testdex.jar
dex2oatd F 11-18 18:14:42 119587 119587 compiler_driver.cc:2041] Boot classpath class java.lang.Class<com.android.org.conscrypt.AbstractConscryptEngine> failed to resolve/is erroneous: state= ErrorResolved
Runtime aborting...
FAILED: out/target/product/armv8/data/art-test/arm64/core.art
[…]
dex2oatd W 11-18 18:14:46 119786 119786 class_linker.cc:4711] Rejecting class com.android.org.conscrypt.JSSEProvider that attempts to sub-type erroneous class java.security.Provider in /system/framework/conscrypt-testdex.jar
dex2oatd F 11-18 18:14:46 119786 119786 compiler_driver.cc:2041] Boot classpath class java.lang.Class<com.android.org.conscrypt.JSSEProvider> failed to resolve/is erroneous: state= ErrorResolved
Runtime aborting...
Test: `art/tools/buildbot-build.sh --target` with master-art manifest
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 119800099
Change-Id: If782420ffe4907e92d2ac90747d66f3d3e1ac127
1 file changed