commit 536e6cd684a10e16817cecb044ac2f0a46dfb6e4
author Dan Albert <danalbert@google.com> Fri Sep 26 22:16:29 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 26 22:16:30 2014 +0000
tree 9be19d5b659df08d30f18bf0565dfc118812418a
parent 6bf4dfa9e7dc61b40316c0f8cfab335dbe53dd52
parent 28c1c841d558e6c618341476d75ea89d2d903669

Merge "Don't manually link stlport."

Android.mk

diff --git a/Android.mk b/Android.mk
index 4af69ea..1946367 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_CPP_EXTENSION := .cc
 
@@ -28,7 +29,7 @@
 			  v8_tools_gyp_v8_libbase_gyp \
                           v8_tools_gyp_v8_snapshot_gyp
 
-LOCAL_SHARED_LIBRARIES := libutils libstlport liblog libicui18n libicuuc
+LOCAL_SHARED_LIBRARIES := libutils liblog libicui18n libicuuc
 
 include external/stlport/libstlport.mk
 

test/Android.mk

diff --git a/test/Android.mk b/test/Android.mk
index 1f04f1f..ad316ef 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -2,6 +2,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_CPP_EXTENSION := .cc
 
@@ -16,11 +17,9 @@
   -Wno-import \
   -Wno-format \
 
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../src $(LOCAL_PATH)/ external/v8 external/gtest
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../src $(LOCAL_PATH)/ external/v8
 
-LOCAL_SHARED_LIBRARIES := libpac libutils libstlport liblog
-
-include external/stlport/libstlport.mk
+LOCAL_SHARED_LIBRARIES := libpac libutils liblog
 
 include $(BUILD_NATIVE_TEST)
 

test/proxy_resolver_v8_unittest.cc

diff --git a/test/proxy_resolver_v8_unittest.cc b/test/proxy_resolver_v8_unittest.cc
index cfd38bc..ad9c826 100644
--- a/test/proxy_resolver_v8_unittest.cc
+++ b/test/proxy_resolver_v8_unittest.cc
@@ -3,14 +3,15 @@
 // found in the LICENSE file.
 
 #define LOG_TAG "ProxyResolverTest"
-
 #include <utils/Log.h>
-#include "android_runtime/AndroidRuntime.h"
+
 #include <string.h>
 
+#include <gtest/gtest.h>
+
+#include "android_runtime/AndroidRuntime.h"
 #include "proxy_test_script.h"
 #include "proxy_resolver_v8.h"
-#include "include/gtest/gtest.h"
 
 using namespace android;
 namespace net {