Merge "Remove dependency on -no_art variant"
am: 2ccde89153
Change-Id: I73179b52f72d82b167d4bfaf38493feac89484a9
This commit is contained in:
commit
1f5228709c
|
@ -24,7 +24,7 @@
|
|||
|
||||
#include <android-base/unique_fd.h>
|
||||
|
||||
#include <dex/code_item_accessors-no_art-inl.h>
|
||||
#include <dex/code_item_accessors-inl.h>
|
||||
#include <dex/compact_dex_file.h>
|
||||
#include <dex/dex_file-inl.h>
|
||||
#include <dex/dex_file_loader.h>
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <unwindstack/MapInfo.h>
|
||||
#include <unwindstack/Memory.h>
|
||||
|
||||
#include <dex/code_item_accessors-no_art-inl.h>
|
||||
#include <dex/code_item_accessors-inl.h>
|
||||
#include <dex/standard_dex_file.h>
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
|
Loading…
Reference in New Issue