OSDN Git Service

Do not allow input-vdex with dexlayout.
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 9 Mar 2017 13:13:25 +0000 (13:13 +0000)
committerNicolas Geoffray <ngeoffray@google.com>
Thu, 9 Mar 2017 20:54:21 +0000 (20:54 +0000)
commit97fa9928c07d3e0ee631235e9619fb0f8949ed7a
treecd19ef9879b0dac1237a8be0d6a0075fcbe54f51
parent2c3fc44464d261c8ae285abbd140b4523dba005c
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
compiler/driver/compiler_driver.cc
compiler/oat_writer.cc
dex2oat/dex2oat.cc
dex2oat/dex2oat_test.cc
runtime/vdex_file.h