commit e91d2cd8e34912ae53dcd7263be3618aee02d723
author Emily Bernier <ember@google.com> Fri Jan 13 17:54:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 13 17:54:51 2017 +0000
tree 20bfc97673994865feda879b520daf29f893be10
parent 0f76016a30684c158b6ab4867575054a2b7cb638
parent f01d9baf3cc23eeb3f22f7094a7d98a9867e0018

Update proxy resolver and tests for V8 API changes. DO NOT MERGE. am: a75708abc6  -s ours am: 08362eefb7 am: 1823a9da9c am: 944f349a2a  -s ours am: a0db1a6d0a am: f44dd06844 am: d82bfc881b am: ec7ed589ed
am: f01d9baf3c

Change-Id: Ibcde064f7cdc5c9800d34d3636f433f148a0f12e

Android.mk

diff --git a/Android.mk b/Android.mk
index e8a2b26..fdd6e85 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,6 +18,7 @@
   -Wno-import \
   -Wno-format \
   -Wno-unused-parameter \
+  -Werror
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/src $(LOCAL_PATH)/../v8
 

src/net_util.cc

diff --git a/src/net_util.cc b/src/net_util.cc
index 992cdd1..8eef03a 100644
--- a/src/net_util.cc
+++ b/src/net_util.cc
@@ -64,7 +64,7 @@
   //   <IPv6-literal> "/" <number of bits>
 
   std::vector<std::string> parts;
-  unsigned int split = cidr_literal.find('/');
+  size_t split = cidr_literal.find('/');
   if (split == std::string::npos)
     return false;
   parts.push_back(cidr_literal.substr(0, split));