From 5ed8b2dfbdf1b487334a661bc5b8dc8ac880e435 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 23 Sep 2015 23:01:31 -0700 Subject: [PATCH] dexdump2 won't be optional when it replaces dexdump. So it should just be in /system/bin, not sad and lonely in /system/xbin. Change-Id: I2edda827d36486f46fdcfd77f0ee6eec1345974c --- dexdump/Android.mk | 2 -- dexdump/dexdump_test.cc | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dexdump/Android.mk b/dexdump/Android.mk index a208ccf89..ec2529e18 100755 --- a/dexdump/Android.mk +++ b/dexdump/Android.mk @@ -34,8 +34,6 @@ LOCAL_C_INCLUDES := $(dexdump_c_includes) LOCAL_CFLAGS += -Wall LOCAL_SHARED_LIBRARIES += $(dexdump_libraries) LOCAL_MODULE := dexdump2 -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) include $(BUILD_EXECUTABLE) endif # !SDK_ONLY diff --git a/dexdump/dexdump_test.cc b/dexdump/dexdump_test.cc index d9b210d76..4230cb26b 100644 --- a/dexdump/dexdump_test.cc +++ b/dexdump/dexdump_test.cc @@ -43,12 +43,7 @@ class DexDumpTest : public CommonRuntimeTest { // Runs test with given arguments. bool Exec(const std::vector& args, std::string* error_msg) { // TODO(ajcbik): dexdump2 -> dexdump - std::string file_path = GetTestAndroidRoot(); - if (IsHost()) { - file_path += "/bin/dexdump2"; - } else { - file_path += "/xbin/dexdump2"; - } + std::string file_path = GetTestAndroidRoot() + "/bin/dexdump2"; EXPECT_TRUE(OS::FileExists(file_path.c_str())) << file_path << " should be a valid file path"; std::vector exec_argv = { file_path }; exec_argv.insert(exec_argv.end(), args.begin(), args.end()); -- 2.11.0