commit 48b7918afa3d1076cf7133f074cd8776ce70fdcb
author Andreas Gampe <agampe@google.com> Wed May 20 16:09:36 2015 -0700
committer Andreas Gampe <agampe@google.com> Wed May 20 16:40:51 2015 -0700
tree 52f56790de7fc702085c41ea1d188f9f9398546c
parent 70c7f22fa013025d07fe9c1a82e7f17c1dbc1d1b

ART: Fix gtest dependency

Gtests should depend on the debug version of libart-disassembler.

Bug: 21273194

(cherry picked from commit 0ae3bf872d3898ed6826216f3f8a04c819e1426b)

Change-Id: Iaf216a1c0cff650296ebf83fe4e8352f5614cb28

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 5d4f1d3..3c2408c 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -417,7 +417,7 @@
   LOCAL_CPP_EXTENSION := $$(ART_CPP_EXTENSION)
   LOCAL_SRC_FILES := $$(art_gtest_filename)
   LOCAL_C_INCLUDES += $$(ART_C_INCLUDES) art/runtime $$(art_gtest_extra_c_includes)
-  LOCAL_SHARED_LIBRARIES += libartd $$(art_gtest_extra_shared_libraries) libart-gtest libart-disassembler
+  LOCAL_SHARED_LIBRARIES += libartd $$(art_gtest_extra_shared_libraries) libart-gtest libartd-disassembler
   LOCAL_WHOLE_STATIC_LIBRARIES += libsigchain
 
   LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk