commit e7ec8b25dd6ac1b8ad8a68f808048bd6a61138f0
author Richard Uhler <ruhler@google.com> Wed Jan 18 14:27:51 2017 +0000
committer Richard Uhler <ruhler@google.com> Wed Jan 18 15:27:16 2017 +0000
tree 15ff579bc746e0852b5c7ea3a04ad2335d80360a
parent 404b0120615fd4590bc51b506074c2dc19d48a65

Revert "Revert "Remove unused code for patching oat files.""

This reverts commit 78985875702c52657066da158c0246ef07115385.

Bug: 33192586
Test: m test-art-host
Test: m test-art-target
Test: device boots

Change-Id: I848b39a2b9b3c48beca2c68f9a316626a81abb39

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 5bdfbc7..cea38e4 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -120,14 +120,14 @@
 ART_GTEST_dex2oat_environment_tests_HOST_DEPS := \
   $(HOST_CORE_IMAGE_optimizing_pic_64) \
   $(HOST_CORE_IMAGE_optimizing_pic_32) \
-  $(HOST_CORE_IMAGE_optimizing_no-pic_64) \
-  $(HOST_CORE_IMAGE_optimizing_no-pic_32) \
+  $(HOST_CORE_IMAGE_interpreter_pic_64) \
+  $(HOST_CORE_IMAGE_interpreter_pic_32) \
   $(HOST_OUT_EXECUTABLES)/patchoatd
 ART_GTEST_dex2oat_environment_tests_TARGET_DEPS := \
   $(TARGET_CORE_IMAGE_optimizing_pic_64) \
   $(TARGET_CORE_IMAGE_optimizing_pic_32) \
-  $(TARGET_CORE_IMAGE_optimizing_no-pic_64) \
-  $(TARGET_CORE_IMAGE_optimizing_no-pic_32) \
+  $(TARGET_CORE_IMAGE_interpreter_pic_64) \
+  $(TARGET_CORE_IMAGE_interpreter_pic_32) \
   $(TARGET_OUT_EXECUTABLES)/patchoatd
 
 ART_GTEST_oat_file_assistant_test_HOST_DEPS := \