Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
diff --git a/components/autofill_core_browser.target.darwin-mips.mk b/components/autofill_core_browser.target.darwin-mips.mk
index 145f8b9..518a74e 100644
--- a/components/autofill_core_browser.target.darwin-mips.mk
+++ b/components/autofill_core_browser.target.darwin-mips.mk
@@ -11,15 +11,15 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \
- $(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
- $(call intermediates-dir-for,GYP,webkit_webkit_resources_gyp)/webkit_resources.stamp
+ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_base_ui_base_gyp)/ui_base_ui_base_gyp.a \
+ $(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \
+ $(call intermediates-dir-for,GYP,components_component_resources_gyp)/component_resources.stamp \
+ $(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp
GYP_GENERATED_OUTPUTS :=
@@ -42,7 +42,6 @@
components/autofill/core/browser/autofill_country.cc \
components/autofill/core/browser/autofill_data_model.cc \
components/autofill/core/browser/autofill_download.cc \
- components/autofill/core/browser/autofill_download_url.cc \
components/autofill/core/browser/autofill_external_delegate.cc \
components/autofill/core/browser/autofill_field.cc \
components/autofill/core/browser/autofill_manager.cc \
@@ -111,6 +110,7 @@
MY_DEFS_Debug := \
'-DV8_DEPRECATION_WARNINGS' \
+ '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -118,9 +118,9 @@
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NEW_GAMEPAD_API=1' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
@@ -131,8 +131,13 @@
'-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \
+ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
'-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \
'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
+ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \
+ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
+ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
@@ -141,7 +146,6 @@
'-DFEATURE_ENABLE_VOICEMAIL' \
'-DEXPAT_RELATIVE_PATH' \
'-DGTEST_RELATIVE_PATH' \
- '-DJSONCPP_RELATIVE_PATH' \
'-DNO_MAIN_THREAD_WRAPPING' \
'-DNO_SOUND_SYSTEM' \
'-DANDROID' \
@@ -151,6 +155,7 @@
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
'-DPOSIX_AVOID_MMAP' \
+ '-DUSE_OPENSSL=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-D__GNU_SOURCE=1' \
@@ -172,7 +177,6 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(gyp_shared_intermediate_dir)/components/strings \
$(LOCAL_PATH)/third_party/skia/src/core \
$(LOCAL_PATH)/third_party/skia/include/core \
$(LOCAL_PATH)/third_party/skia/include/effects \
@@ -192,14 +196,13 @@
$(LOCAL_PATH)/third_party \
$(LOCAL_PATH)/third_party/webrtc \
$(PWD)/external/expat/lib \
- $(LOCAL_PATH)/third_party/jsoncpp/overrides/include \
- $(LOCAL_PATH)/third_party/jsoncpp/source/include \
$(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \
$(LOCAL_PATH)/third_party/libphonenumber/src \
$(gyp_shared_intermediate_dir)/protoc_out \
$(LOCAL_PATH)/third_party/protobuf \
$(LOCAL_PATH)/third_party/protobuf/src \
- $(gyp_shared_intermediate_dir)/webkit \
+ $(gyp_shared_intermediate_dir)/components \
+ $(gyp_shared_intermediate_dir)/components/strings \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -252,6 +255,7 @@
MY_DEFS_Release := \
'-DV8_DEPRECATION_WARNINGS' \
+ '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -259,9 +263,9 @@
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NEW_GAMEPAD_API=1' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
@@ -272,8 +276,13 @@
'-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \
+ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
'-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \
'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
+ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \
+ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
+ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
@@ -282,7 +291,6 @@
'-DFEATURE_ENABLE_VOICEMAIL' \
'-DEXPAT_RELATIVE_PATH' \
'-DGTEST_RELATIVE_PATH' \
- '-DJSONCPP_RELATIVE_PATH' \
'-DNO_MAIN_THREAD_WRAPPING' \
'-DNO_SOUND_SYSTEM' \
'-DANDROID' \
@@ -292,6 +300,7 @@
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
'-DPOSIX_AVOID_MMAP' \
+ '-DUSE_OPENSSL=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-D__GNU_SOURCE=1' \
@@ -314,7 +323,6 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(gyp_shared_intermediate_dir)/components/strings \
$(LOCAL_PATH)/third_party/skia/src/core \
$(LOCAL_PATH)/third_party/skia/include/core \
$(LOCAL_PATH)/third_party/skia/include/effects \
@@ -334,14 +342,13 @@
$(LOCAL_PATH)/third_party \
$(LOCAL_PATH)/third_party/webrtc \
$(PWD)/external/expat/lib \
- $(LOCAL_PATH)/third_party/jsoncpp/overrides/include \
- $(LOCAL_PATH)/third_party/jsoncpp/source/include \
$(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \
$(LOCAL_PATH)/third_party/libphonenumber/src \
$(gyp_shared_intermediate_dir)/protoc_out \
$(LOCAL_PATH)/third_party/protobuf \
$(LOCAL_PATH)/third_party/protobuf/src \
- $(gyp_shared_intermediate_dir)/webkit \
+ $(gyp_shared_intermediate_dir)/components \
+ $(gyp_shared_intermediate_dir)/components/strings \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -361,9 +368,11 @@
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
+LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
LOCAL_LDFLAGS_Debug := \
+ -Wl,--fatal-warnings \
-Wl,-z,now \
-Wl,-z,relro \
-Wl,-z,noexecstack \
@@ -373,7 +382,6 @@
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
- -Wl,--fatal-warnings \
-Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -381,6 +389,7 @@
LOCAL_LDFLAGS_Release := \
+ -Wl,--fatal-warnings \
-Wl,-z,now \
-Wl,-z,relro \
-Wl,-z,noexecstack \
@@ -393,7 +402,6 @@
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
- -Wl,--fatal-warnings \
-Wl,--warn-shared-textrel
@@ -402,7 +410,7 @@
LOCAL_STATIC_LIBRARIES := \
skia_skia_library_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp \
- ui_ui_gyp
+ ui_base_ui_base_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true