diff options
| author | Ben Murdoch <benm@google.com> | 2014-12-16 20:34:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-16 20:34:47 +0000 |
| commit | 30527f7ffabcca3ff43dd096311316ec9ce2884c (patch) | |
| tree | 12f110451f06442b0e5b2652cbd75edeb3961d6e | |
| parent | cbf0204ee55aa3a18cf4532bb56a7fc933dafa31 (diff) | |
| parent | d972a35bb93a1aaf96b52b80d4b69ce2c4c8ac4b (diff) | |
| download | chromium-libpac-30527f7ffabcca3ff43dd096311316ec9ce2884c.tar.gz | |
am d972a35b: Merge "Start using libv8 rather than WebView V8."master-soong
* commit 'd972a35bb93a1aaf96b52b80d4b69ce2c4c8ac4b':
Start using libv8 rather than WebView V8.
| -rw-r--r-- | Android.mk | 23 | ||||
| -rw-r--r-- | src/net_util.cc | 1 | ||||
| -rw-r--r-- | src/proxy_resolver_v8.cc | 21 | ||||
| -rw-r--r-- | src/proxy_resolver_v8.h | 3 |
4 files changed, 17 insertions, 31 deletions
@@ -19,21 +19,12 @@ LOCAL_CFLAGS += \ -Wno-format \ -Wno-unused-parameter \ -LOCAL_C_INCLUDES += $(LOCAL_PATH)/src \ - external/chromium_org/v8 \ - external/chromium_org/src/v8 \ - -# Depend on V8 from WebView -# DO NOT COPY without permission from WebView Owners -LOCAL_STATIC_LIBRARIES := v8_tools_gyp_v8_base_gyp \ - v8_tools_gyp_v8_libbase_gyp \ - v8_tools_gyp_v8_snapshot_gyp \ - third_party_icu_icui18n_gyp \ - third_party_icu_icuuc_gyp \ - third_party_icu_icudata_gyp - -LOCAL_SHARED_LIBRARIES := libutils liblog libgabi++ - -include external/stlport/libstlport.mk +LOCAL_C_INCLUDES += $(LOCAL_PATH)/src + +LOCAL_STATIC_LIBRARIES := libv8 + +LOCAL_SHARED_LIBRARIES := libutils liblog + +LOCAL_CXX_STL := libc++ include $(BUILD_SHARED_LIBRARY) diff --git a/src/net_util.cc b/src/net_util.cc index 5f8c88b..992cdd1 100644 --- a/src/net_util.cc +++ b/src/net_util.cc @@ -4,6 +4,7 @@ #include <algorithm> +#include <cstdlib> #include <iterator> #include <map> diff --git a/src/proxy_resolver_v8.cc b/src/proxy_resolver_v8.cc index 3400967..7e52dc6 100644 --- a/src/proxy_resolver_v8.cc +++ b/src/proxy_resolver_v8.cc @@ -2,25 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <algorithm> -#include <cstdio> -#include <string> - -#include <utils/String16.h> - #include "proxy_resolver_v8.h" -#include "proxy_resolver_script.h" -#include "net_util.h" -#include <include/v8.h> #include <algorithm> -#include <vector> - +#include <cstdio> #include <iostream> - -#include <string.h> +#include <string> #include <utils/String8.h> -#include <utils/String16.h> +#include <v8.h> +#include <vector> + +#include "net_util.h" +#include "proxy_resolver_script.h" // Notes on the javascript environment: // diff --git a/src/proxy_resolver_v8.h b/src/proxy_resolver_v8.h index 818cb58..13a1bd8 100644 --- a/src/proxy_resolver_v8.h +++ b/src/proxy_resolver_v8.h @@ -5,10 +5,11 @@ #ifndef NET_PROXY_PROXY_RESOLVER_V8_H_ #define NET_PROXY_PROXY_RESOLVER_V8_H_ #pragma once -#include "proxy_resolver_js_bindings.h" #include <utils/String16.h> +#include "proxy_resolver_js_bindings.h" + namespace net { typedef void* RequestHandle; |