Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I951118a03836157090561764dd2627f0add8118f
diff --git a/base/base.target.linux-x86.mk b/base/base.target.linux-x86.mk
index 59b2553..8ea1770 100644
--- a/base/base.target.linux-x86.mk
+++ b/base/base.target.linux-x86.mk
@@ -13,7 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,testing_gtest_prod_gyp)/gtest_prod.stamp \
$(call intermediates-dir-for,GYP,base_base_jni_headers_gyp)/base_jni_headers.stamp \
- $(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp
+ $(call intermediates-dir-for,GYP,third_party_ashmem_ashmem_gyp)/ashmem.stamp
GYP_GENERATED_OUTPUTS :=
@@ -40,6 +40,7 @@
base/third_party/nspr/prtime.cc \
base/allocator/allocator_extension.cc \
base/allocator/type_profiler_control.cc \
+ base/android/activity_status.cc \
base/android/base_jni_registrar.cc \
base/android/build_info.cc \
base/android/cpu_features.cc \
@@ -50,7 +51,6 @@
base/android/jni_helper.cc \
base/android/jni_registrar.cc \
base/android/jni_string.cc \
- base/android/locale_utils.cc \
base/android/path_service_android.cc \
base/android/path_utils.cc \
base/at_exit.cc \
@@ -72,6 +72,7 @@
base/debug/stack_trace_android.cc \
base/debug/trace_event_android.cc \
base/debug/trace_event_impl.cc \
+ base/deferred_sequenced_task_runner.cc \
base/environment.cc \
base/file_util.cc \
base/file_util_android.cc \
@@ -102,11 +103,13 @@
base/memory/discardable_memory_android.cc \
base/memory/ref_counted.cc \
base/memory/ref_counted_memory.cc \
+ base/memory/shared_memory_android.cc \
+ base/memory/shared_memory_posix.cc \
base/memory/singleton.cc \
base/memory/weak_ptr.cc \
+ base/message_loop/message_loop_proxy.cc \
+ base/message_loop/message_loop_proxy_impl.cc \
base/message_loop.cc \
- base/message_loop_proxy.cc \
- base/message_loop_proxy_impl.cc \
base/message_pump.cc \
base/message_pump_default.cc \
base/metrics/sample_map.cc \
@@ -129,6 +132,8 @@
base/platform_file_posix.cc \
base/posix/global_descriptors.cc \
base/posix/unix_domain_socket_linux.cc \
+ base/power_monitor/power_monitor.cc \
+ base/power_monitor/power_monitor_android.cc \
base/process_posix.cc \
base/process_util.cc \
base/process_util_linux.cc \
@@ -144,17 +149,16 @@
base/sequence_checker_impl.cc \
base/sequenced_task_runner.cc \
base/sha1_portable.cc \
- base/shared_memory_android.cc \
- base/shared_memory_posix.cc \
- base/string_piece.cc \
base/string_util.cc \
base/string16.cc \
base/stringprintf.cc \
base/strings/string_split.cc \
base/strings/string_number_conversions.cc \
+ base/strings/string_piece.cc \
base/strings/sys_string_conversions_posix.cc \
base/strings/utf_offset_string_conversions.cc \
base/strings/utf_string_conversion_utils.cc \
+ base/strings/utf_string_conversions.cc \
base/supports_user_data.cc \
base/synchronization/cancellation_flag.cc \
base/synchronization/condition_variable_posix.cc \
@@ -163,7 +167,6 @@
base/synchronization/waitable_event_posix.cc \
base/synchronization/waitable_event_watcher_posix.cc \
base/system_monitor/system_monitor.cc \
- base/system_monitor/system_monitor_android.cc \
base/sys_info.cc \
base/sys_info_android.cc \
base/sys_info_linux.cc \
@@ -194,7 +197,6 @@
base/timer.cc \
base/tracked_objects.cc \
base/tracking_info.cc \
- base/utf_string_conversions.cc \
base/values.cc \
base/value_conversions.cc \
base/version.cc \
@@ -218,6 +220,7 @@
-march=pentium4 \
-msse2 \
-mfpmath=sse \
+ -fuse-ld=gold \
-ffunction-sections \
-funwind-tables \
-g \
@@ -238,7 +241,6 @@
MY_CFLAGS_C :=
MY_DEFS := \
- '-DUSE_SKIA' \
'-D_FILE_OFFSET_BITS=64' \
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
@@ -246,13 +248,11 @@
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
- '-DENABLE_PEPPER_THREADING' \
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DENABLE_LANGUAGE_DETECTION=1' \
'-DUSE_SYMBOLIZE' \
- '-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DBASE_IMPLEMENTATION' \
@@ -269,10 +269,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/base \
- $(GYP_ABS_ANDROID_TOP_DIR)/external/icu4c/common \
- $(GYP_ABS_ANDROID_TOP_DIR)/external/icu4c/i18n \
+ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(GYP_ABS_ANDROID_TOP_DIR)/frameworks/wilhelm/include \
$(GYP_ABS_ANDROID_TOP_DIR)/bionic \
@@ -298,12 +296,13 @@
-Wl,-z,noexecstack \
-fPIC \
-m32 \
+ -fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
+ -Wl,--gc-sections \
-Wl,-O1 \
- -Wl,--as-needed \
- -Wl,--gc-sections
+ -Wl,--as-needed
LOCAL_STATIC_LIBRARIES := \