diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-26 22:30:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 22:30:05 +0000 |
| commit | 91a100fdb719e5eb7b31577cc4a414fbc032d86d (patch) | |
| tree | 9be19d5b659df08d30f18bf0565dfc118812418a | |
| parent | 8f27d06622de9a6539d1cb2b814c5f847f9b19bc (diff) | |
| parent | 536e6cd684a10e16817cecb044ac2f0a46dfb6e4 (diff) | |
| download | chromium-libpac-91a100fdb719e5eb7b31577cc4a414fbc032d86d.tar.gz | |
am 536e6cd6: Merge "Don\'t manually link stlport."
* commit '536e6cd684a10e16817cecb044ac2f0a46dfb6e4':
Don't manually link stlport.
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | test/Android.mk | 7 | ||||
| -rw-r--r-- | test/proxy_resolver_v8_unittest.cc | 7 |
3 files changed, 9 insertions, 8 deletions
@@ -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 @@ LOCAL_STATIC_LIBRARIES := v8_tools_gyp_v8_base_gyp \ 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 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 @@ ifneq ($(TARGET_SIMULATOR),true) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CPP_EXTENSION := .cc @@ -16,11 +17,9 @@ LOCAL_CFLAGS += \ -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) 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 { |