commit a3cf097252e3aa1e6ab060dd9bcba348bd9e2d8f
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 20 00:55:59 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 20 00:55:59 2017 +0000
tree 9e24049bafe41f262c4b9406070cbcea66b78324
parent 45b949b5a29dea022683262e54b1d76a4a61d8e0
parent 765904540e677fdbc1d802fc9739ad1e1556f8d3

Merge "Add libtest_dlopen_df_1_global.so"

hostsidetests/sustainedperf/dhrystone/dhry_1.c

diff --git a/hostsidetests/sustainedperf/dhrystone/dhry_1.c b/hostsidetests/sustainedperf/dhrystone/dhry_1.c
index c1198d1..3682052 100644
--- a/hostsidetests/sustainedperf/dhrystone/dhry_1.c
+++ b/hostsidetests/sustainedperf/dhrystone/dhry_1.c
@@ -28,7 +28,6 @@
 int             Arr_1_Glob [50];
 int             Arr_2_Glob [50] [50];
 
-extern char     *malloc ();
 Enumeration     Func_1 ();
   /* forward declaration necessary since Enumeration may not simply be int */
 

tests/camera/AndroidTest.xml

diff --git a/tests/camera/AndroidTest.xml b/tests/camera/AndroidTest.xml
index 5a25cbd..c046a59 100644
--- a/tests/camera/AndroidTest.xml
+++ b/tests/camera/AndroidTest.xml
@@ -22,7 +22,7 @@
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.camera.cts" />
         <option name="runtime-hint" value="12m7s" />
-        <!-- test-timeout unit is ms, value = 60 min -->
-        <option name="test-timeout" value="3600000" />
+        <!-- test-timeout unit is ms, value = 200 min -->
+        <option name="test-timeout" value="12000000" />
     </test>
 </configuration>

tests/tests/simpleperf/Android.mk

diff --git a/tests/tests/simpleperf/Android.mk b/tests/tests/simpleperf/Android.mk
index c7f2afb..d72e03f 100644
--- a/tests/tests/simpleperf/Android.mk
+++ b/tests/tests/simpleperf/Android.mk
@@ -19,6 +19,7 @@
   libbacktrace_offline \
   libbacktrace \
   libunwind \
+  libunwindstack \
   libziparchive \
   libz \
   libgtest \