OSDN Git Service

Do not try to compile resource-only dex files.
authorRichard Uhler <ruhler@google.com>
Wed, 24 Jun 2015 15:44:19 +0000 (08:44 -0700)
committerRichard Uhler <ruhler@google.com>
Thu, 25 Jun 2015 15:33:59 +0000 (08:33 -0700)
commit9b994ea841eaaefbdda652251894a74db9cefcc8
tree1301a50074df3fa4de66d2fd0580aa67237fa90f
parent7467fa30adceb7287e70075b7c8de0cdade60c4c
Do not try to compile resource-only dex files.

This changes behavior in the case where we are asked to load a dex
file that does not exist or has no classes.dex entry.

Previously we would run dex2oat, which would log an error message and
fail. Now we skip running dex2oat, we report the DexOptStatus as
kNoDexOptNeeded, and we do not try to fall back to the missing
original dex files.

Bug: 21722039
(cherry picked from commit cb44b11a926696e34b3dc44288e762b4303cc128)

Change-Id: I84a85dc9ece54bcc0a5283f871e09bf68471c6e7
runtime/class_linker.cc
runtime/oat_file_assistant.cc
runtime/oat_file_assistant.h
runtime/oat_file_assistant_test.cc