summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-05-20 16:09:36 -0700
committerAndreas Gampe <agampe@google.com>2015-05-20 16:40:51 -0700
commit48b7918afa3d1076cf7133f074cd8776ce70fdcb (patch)
tree52f56790de7fc702085c41ea1d188f9f9398546c /build
parent70c7f22fa013025d07fe9c1a82e7f17c1dbc1d1b (diff)
downloadart-48b7918afa3d1076cf7133f074cd8776ce70fdcb.zip
art-48b7918afa3d1076cf7133f074cd8776ce70fdcb.tar.gz
art-48b7918afa3d1076cf7133f074cd8776ce70fdcb.tar.bz2
ART: Fix gtest dependency
Gtests should depend on the debug version of libart-disassembler. Bug: 21273194 (cherry picked from commit 0ae3bf872d3898ed6826216f3f8a04c819e1426b) Change-Id: Iaf216a1c0cff650296ebf83fe4e8352f5614cb28
Diffstat (limited to 'build')
-rw-r--r--build/Android.gtest.mk2
1 files changed, 1 insertions, 1 deletions
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 @@ define define-art-gtest
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