diff options
| author | Ying Wang <wangying@google.com> | 2010-11-05 11:23:17 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-11-09 09:52:17 -0800 |
| commit | e3b47eb8b9b553d49f44b4156dbe371240c66ef4 (patch) | |
| tree | 213be421fbe336299e922087795d9c63d7f90562 /net | |
| parent | 728c2df562c0363b8a6c676c8a5c01cada24cf9f (diff) | |
| download | external_chromium-e3b47eb8b9b553d49f44b4156dbe371240c66ef4.zip external_chromium-e3b47eb8b9b553d49f44b4156dbe371240c66ef4.tar.gz external_chromium-e3b47eb8b9b553d49f44b4156dbe371240c66ef4.tar.bz2 | |
Build the .proto with the build system rules.
and use the lite version of libprotobuff.
Change-Id: Ie1f57d2c486408a610d546f388e121fa28734b00
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket/ssl_host_info.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/socket/ssl_host_info.cc b/net/socket/ssl_host_info.cc index 4b5bb02..cc29545 100644 --- a/net/socket/ssl_host_info.cc +++ b/net/socket/ssl_host_info.cc @@ -5,7 +5,13 @@ #include "net/socket/ssl_host_info.h" #include "net/socket/ssl_client_socket.h" +#ifdef ANDROID +// the android platform build system use a fixed include path relative to the +// top directory (root of the source tree). +#include "external/chromium/net/socket/ssl_host_info.pb.h" +#else #include "net/socket/ssl_host_info.pb.h" +#endif namespace net { |