commit 97fa9928c07d3e0ee631235e9619fb0f8949ed7a
author Nicolas Geoffray <ngeoffray@google.com> Thu Mar 09 13:13:25 2017 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Mar 09 20:54:21 2017 +0000
tree cd19ef9879b0dac1237a8be0d6a0075fcbe54f51
parent 2c3fc44464d261c8ae285abbd140b4523dba005c

Do not allow input-vdex with dexlayout.

input-vdex and dexlayout are incompatible with each other.

bug: 36084905
bug: 36076104
bug: 36059948
bug: 35872504

Test: device boots, vdex works on OTA, input-vdex is not passed
      for speed-profile.

Change-Id: I630c90acf0a8f49f50b7909e2dec995dd4a4d13f

compiler/dex/dex_to_dex_decompiler.cc

diff --git a/compiler/dex/dex_to_dex_decompiler.cc b/compiler/dex/dex_to_dex_decompiler.cc
index 5360103..85d5784 100644
--- a/compiler/dex/dex_to_dex_decompiler.cc
+++ b/compiler/dex/dex_to_dex_decompiler.cc
@@ -185,7 +185,7 @@
   }
 
   if (quickened_info_ptr_ != quickened_info_end_) {
-    LOG(ERROR) << "Failed to use all values in quickening info."
+    LOG(FATAL) << "Failed to use all values in quickening info."
                << " Actual: " << std::hex << quickened_info_ptr_
                << " Expected: " << quickened_info_end_;
     return false;