summaryrefslogtreecommitdiffstats
path: root/test/Android.libnativebridgetest.mk
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-10-22 22:06:39 -0700
committerIan Rogers <irogers@google.com>2014-10-22 22:21:57 -0700
commitcf7f19135f0e273f7b0136315633c2abfc715343 (patch)
treeffa4d9efd9c45f4b6789acc1f534bb9327052b7e /test/Android.libnativebridgetest.mk
parentaea6888b056be21adf762e066c7f33b8939b8a06 (diff)
downloadart-cf7f19135f0e273f7b0136315633c2abfc715343.zip
art-cf7f19135f0e273f7b0136315633c2abfc715343.tar.gz
art-cf7f19135f0e273f7b0136315633c2abfc715343.tar.bz2
C++11 related clean-up of DISALLOW_..
Move DISALLOW_COPY_AND_ASSIGN to delete functions. By no having declarations with no definitions this prompts better warning messages so deal with these by correcting the code. Add a DISALLOW_ALLOCATION and use for ValueObject and mirror::Object. Make X86 assembly operand types ValueObjects to fix compilation errors. Tidy the use of iostream and ostream. Avoid making cutils a dependency via mutex-inl.h for tests that link against libart. Push tracing dependencies into appropriate files and mutex.cc. x86 32-bit host symbols size is increased for libarttest, avoid copying this in run-test 115 by using symlinks and remove this test's higher than normal ulimit. Fix the RunningOnValgrind test in RosAllocSpace to not use GetHeap as it returns NULL when the heap is under construction by Runtime. Change-Id: Ia246f7ac0c11f73072b30d70566a196e9b78472b
Diffstat (limited to 'test/Android.libnativebridgetest.mk')
-rw-r--r--test/Android.libnativebridgetest.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/Android.libnativebridgetest.mk b/test/Android.libnativebridgetest.mk
index 5e2493c..1b20e69 100644
--- a/test/Android.libnativebridgetest.mk
+++ b/test/Android.libnativebridgetest.mk
@@ -51,7 +51,7 @@ define build-libnativebridgetest
ifeq ($$(art_target_or_host),target)
$(call set-target-local-clang-vars)
$(call set-target-local-cflags-vars,debug)
- LOCAL_SHARED_LIBRARIES += libdl libcutils
+ LOCAL_SHARED_LIBRARIES += libdl
LOCAL_STATIC_LIBRARIES := libgtest
LOCAL_MULTILIB := both
LOCAL_MODULE_PATH_32 := $(ART_TARGET_TEST_OUT)/$(ART_TARGET_ARCH_32)