diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-10-27 16:10:26 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-10-27 16:10:26 +0000 |
| commit | 8259600a13c9e8520d75b60d9b54fd6f06ea767e (patch) | |
| tree | 5980d3790187c3c0dd7936abc65ccd0aef2f9fbb | |
| parent | 94ff860ff1adf055396cb802e92d0e05b3c18b22 (diff) | |
| parent | 4cd643d5eeb9fcfd40badacc42cf7e31833965c9 (diff) | |
| download | chromium-libpac-8259600a13c9e8520d75b60d9b54fd6f06ea767e.tar.gz | |
Merge latest chromium changes into master.
Update libpac for the latest chromium.
Change-Id: Ie23416a035aae61ae6ca9300f913708db7a0760f
| -rw-r--r-- | Android.mk | 7 | ||||
| -rw-r--r-- | src/proxy_resolver_v8.cc | 3 |
2 files changed, 7 insertions, 3 deletions
@@ -27,9 +27,12 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/src \ # 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 + 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 libicui18n libicuuc +LOCAL_SHARED_LIBRARIES := libutils liblog libgabi++ include external/stlport/libstlport.mk diff --git a/src/proxy_resolver_v8.cc b/src/proxy_resolver_v8.cc index dcd27a1..4d43253 100644 --- a/src/proxy_resolver_v8.cc +++ b/src/proxy_resolver_v8.cc @@ -116,7 +116,8 @@ class V8ExternalStringFromScriptData }; // External string wrapper so V8 can access a string literal. -class V8ExternalASCIILiteral : public v8::String::ExternalAsciiStringResource { +class V8ExternalASCIILiteral + : public v8::String::ExternalOneByteStringResource { public: // |ascii| must be a NULL-terminated C string, and must remain valid // throughout this object's lifetime. |