From a98c62aa74c5fe14c0b2eeaf15ead65ec32163f1 Mon Sep 17 00:00:00 2001 From: Bo Liu Date: Tue, 15 Jul 2014 14:01:38 -0700 Subject: Update makefiles after merge of Chromium at 37.0.2062.21 This commit was generated by merge_from_chromium.py. Change-Id: I6b62a23ae43d9772dbbddf7f2751e0312379bbd3 --- ots.target.darwin-arm.mk | 2 +- ots.target.darwin-arm64.mk | 2 -- ots.target.darwin-mips.mk | 2 +- ots.target.darwin-x86.mk | 2 +- ots.target.darwin-x86_64.mk | 2 +- ots.target.linux-arm.mk | 2 +- ots.target.linux-arm64.mk | 2 -- ots.target.linux-mips.mk | 2 +- ots.target.linux-x86.mk | 2 +- ots.target.linux-x86_64.mk | 2 +- 10 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk index 2d08b34..4821eda 100644 --- a/ots.target.darwin-arm.mk +++ b/ots.target.darwin-arm.mk @@ -93,9 +93,9 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk index e40c8f9..96c6ebc 100644 --- a/ots.target.darwin-arm64.mk +++ b/ots.target.darwin-arm64.mk @@ -83,7 +83,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -175,7 +174,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk index bd4c2c8..0362d21 100644 --- a/ots.target.darwin-mips.mk +++ b/ots.target.darwin-mips.mk @@ -87,9 +87,9 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk index f445a2a..0879bd2 100644 --- a/ots.target.darwin-x86.mk +++ b/ots.target.darwin-x86.mk @@ -88,9 +88,9 @@ MY_CFLAGS_Debug := \ -fno-stack-protector \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk index 62bb57a..4c7e906 100644 --- a/ots.target.darwin-x86_64.mk +++ b/ots.target.darwin-x86_64.mk @@ -87,9 +87,9 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk index 2d08b34..4821eda 100644 --- a/ots.target.linux-arm.mk +++ b/ots.target.linux-arm.mk @@ -93,9 +93,9 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk index e40c8f9..96c6ebc 100644 --- a/ots.target.linux-arm64.mk +++ b/ots.target.linux-arm64.mk @@ -83,7 +83,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -175,7 +174,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk index bd4c2c8..0362d21 100644 --- a/ots.target.linux-mips.mk +++ b/ots.target.linux-mips.mk @@ -87,9 +87,9 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk index f445a2a..0879bd2 100644 --- a/ots.target.linux-x86.mk +++ b/ots.target.linux-x86.mk @@ -88,9 +88,9 @@ MY_CFLAGS_Debug := \ -fno-stack-protector \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk index 62bb57a..4c7e906 100644 --- a/ots.target.linux-x86_64.mk +++ b/ots.target.linux-x86_64.mk @@ -87,9 +87,9 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ -- cgit v1.2.3 From ac9861b1e86791daa3728a7d285e4b84cfd16959 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Wed, 10 Sep 2014 10:54:35 +0100 Subject: Update makefiles after merge Change-Id: Ib123e2cb281ae812cb831c16e2da599bfbc7a2bb --- ots.target.darwin-arm.mk | 5 +++++ ots.target.darwin-arm64.mk | 5 +++++ ots.target.darwin-mips.mk | 5 +++++ ots.target.darwin-x86.mk | 5 +++++ ots.target.darwin-x86_64.mk | 5 +++++ ots.target.linux-arm.mk | 5 +++++ ots.target.linux-arm64.mk | 5 +++++ ots.target.linux-mips.mk | 5 +++++ ots.target.linux-x86.mk | 5 +++++ ots.target.linux-x86_64.mk | 5 +++++ 10 files changed, 50 insertions(+) diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk index 4821eda..5b41e71 100644 --- a/ots.target.darwin-arm.mk +++ b/ots.target.darwin-arm.mk @@ -158,6 +158,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -260,7 +262,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(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) diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk index 96c6ebc..5e39f67 100644 --- a/ots.target.darwin-arm64.mk +++ b/ots.target.darwin-arm64.mk @@ -146,6 +146,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -236,7 +238,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(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) diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk index 0362d21..f2eee4f 100644 --- a/ots.target.darwin-mips.mk +++ b/ots.target.darwin-mips.mk @@ -152,6 +152,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -248,7 +250,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(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) diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk index 0879bd2..d46ea69 100644 --- a/ots.target.darwin-x86.mk +++ b/ots.target.darwin-x86.mk @@ -152,6 +152,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -248,7 +250,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(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) diff --git a/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk index 4c7e906..e72c139 100644 --- a/ots.target.darwin-x86_64.mk +++ b/ots.target.darwin-x86_64.mk @@ -151,6 +151,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -246,7 +248,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(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) diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk index 4821eda..5b41e71 100644 --- a/ots.target.linux-arm.mk +++ b/ots.target.linux-arm.mk @@ -158,6 +158,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -260,7 +262,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(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) diff --git a/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk index 96c6ebc..5e39f67 100644 --- a/ots.target.linux-arm64.mk +++ b/ots.target.linux-arm64.mk @@ -146,6 +146,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -236,7 +238,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(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) diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk index 0362d21..f2eee4f 100644 --- a/ots.target.linux-mips.mk +++ b/ots.target.linux-mips.mk @@ -152,6 +152,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -248,7 +250,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(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) diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk index 0879bd2..d46ea69 100644 --- a/ots.target.linux-x86.mk +++ b/ots.target.linux-x86.mk @@ -152,6 +152,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -248,7 +250,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(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) diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk index 4c7e906..e72c139 100644 --- a/ots.target.linux-x86_64.mk +++ b/ots.target.linux-x86_64.mk @@ -151,6 +151,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -246,7 +248,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(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) -- cgit v1.2.3