diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-08 15:21:04 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-03-09 02:17:46 +0000 |
| commit | e0dcd46314d07eeb332edea292f5110178e4e3d2 (patch) | |
| tree | d1060bc54e1ad26bad69a6e06662e643e75ce484 /build | |
| parent | 80a250f8862096b72e7357c12b40dc9d5310a475 (diff) | |
| download | art-e0dcd46314d07eeb332edea292f5110178e4e3d2.zip art-e0dcd46314d07eeb332edea292f5110178e4e3d2.tar.gz art-e0dcd46314d07eeb332edea292f5110178e4e3d2.tar.bz2 | |
JNI down call fixes.
Ensure SIRT isn't accessed via quick callee save frame.
Some tidying of code.
Change-Id: I8fec3e89aa6d2e86789c60a07550db2e92478ca7
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.gtest.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 19748a8..7829f9b 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -173,6 +173,10 @@ define build-art-test # Mac OS complains about unresolved symbols if you don't include this. LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_host endif + ifneq ($(BUILD_HOST_64bit),) + # 64bit Linux complains about unresolved symbols if you don't include this. + LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_host + endif include $(BUILD_HOST_EXECUTABLE) art_gtest_exe := $(HOST_OUT_EXECUTABLES)/$$(LOCAL_MODULE) ART_HOST_GTEST_EXECUTABLES += $$(art_gtest_exe) |