Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit feaf9f1d authored by David Sehr's avatar David Sehr Committed by android-build-merger
Browse files

Merge "Remove dependency on -no_art variant" am: 2ccde891 am: 1f522870 

am: 1f42401f

Change-Id: I58e8ff0d06708d42ff2dbfe4cb85820dfb4c05d3
parents c67fd14f 1f42401f

libunwindstack/DexFile.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>

libunwindstack/tests/DexFileTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>