diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-16 18:24:18 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-30 11:53:32 +0100 |
| commit | cff883f9cb6588d9ccfa21e25adc086d0e089785 (patch) | |
| tree | dbfd224c718f9d702838aac7fa44e60aede6d68c /Android.mk | |
| parent | 8297ab3309d54ee2605e22f87edf5ce969229b77 (diff) | |
| download | external_chromium-cff883f9cb6588d9ccfa21e25adc086d0e089785.zip external_chromium-cff883f9cb6588d9ccfa21e25adc086d0e089785.tar.gz external_chromium-cff883f9cb6588d9ccfa21e25adc086d0e089785.tar.bz2 | |
Merge Chromium at r11.0.696.0: Fix Makefile
Change-Id: I57ff823ba3d2d45e8a1561665d7915a964c94cf3
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -121,7 +121,7 @@ LOCAL_SRC_FILES := \ \ base/threading/platform_thread_posix.cc \ base/threading/thread.cc \ - base/threading/thread_checker.cc \ + base/threading/thread_checker_impl.cc \ base/threading/thread_collision_warner.cc \ base/threading/thread_local_posix.cc \ base/threading/thread_local_storage_posix.cc \ @@ -169,6 +169,7 @@ LOCAL_SRC_FILES := \ net/base/network_change_notifier.cc \ net/base/network_change_notifier_linux.cc \ net/base/network_change_notifier_netlink_linux.cc \ + net/base/network_delegate.cc \ net/base/openssl_memory_private_key_store.cc \ net/base/pem_tokenizer.cc \ net/base/platform_mime_util_android.cc \ @@ -247,8 +248,10 @@ LOCAL_SRC_FILES := \ net/http/http_response_headers.cc \ net/http/http_response_info.cc \ net/http/http_stream_factory.cc \ + net/http/http_stream_factory_impl.cc \ + net/http/http_stream_factory_impl_job.cc \ + net/http/http_stream_factory_impl_request.cc \ net/http/http_stream_parser.cc \ - net/http/http_stream_request.cc \ net/http/http_util.cc \ net/http/http_util_icu.cc \ net/http/http_vary_data.cc \ @@ -342,6 +345,7 @@ LOCAL_SRC_FILES += \ \ chrome/browser/autofill/address.cc \ chrome/browser/autofill/address_field.cc \ + chrome/browser/autofill/autofill_country.cc \ chrome/browser/autofill/autofill_download.cc \ chrome/browser/autofill/autofill_field.cc \ chrome/browser/autofill/autofill_manager.cc \ @@ -356,7 +360,6 @@ LOCAL_SRC_FILES += \ chrome/browser/autofill/form_field.cc \ chrome/browser/autofill/form_group.cc \ chrome/browser/autofill/form_structure.cc \ - chrome/browser/autofill/home_address.cc \ chrome/browser/autofill/name_field.cc \ chrome/browser/autofill/home_phone_number.cc \ chrome/browser/autofill/personal_data_manager.cc \ |