diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-11-05 12:52:01 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-11-05 12:52:01 +0000 |
| commit | ebcf8e9e94deab913a6e6053deb834abae5d983c (patch) | |
| tree | 93e382e3f3bc787c5e36210c54ab38a688907718 | |
| parent | 8727b1c2dcbf19b4f3dddd17fb93fc15cae94869 (diff) | |
| download | icu-ebcf8e9e94deab913a6e6053deb834abae5d983c.tar.gz | |
Update makefiles after merge of Chromium at a2687e6f753c
This commit was generated by merge_from_chromium.py.
Change-Id: I7007045056c4b8a2d7e5ac06fb3d7f83cb92dced
36 files changed, 36 insertions, 0 deletions
diff --git a/icudata.host.darwin-arm.mk b/icudata.host.darwin-arm.mk index 972b890..14a9e9d 100644 --- a/icudata.host.darwin-arm.mk +++ b/icudata.host.darwin-arm.mk @@ -191,6 +191,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icudata.host.darwin-arm64.mk b/icudata.host.darwin-arm64.mk index 0ccce63..8e223b8 100644 --- a/icudata.host.darwin-arm64.mk +++ b/icudata.host.darwin-arm64.mk @@ -189,6 +189,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icudata.host.darwin-mips.mk b/icudata.host.darwin-mips.mk index f85169b..673a187 100644 --- a/icudata.host.darwin-mips.mk +++ b/icudata.host.darwin-mips.mk @@ -193,6 +193,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icudata.host.darwin-mips64.mk b/icudata.host.darwin-mips64.mk index 9a5a2eb..6566826 100644 --- a/icudata.host.darwin-mips64.mk +++ b/icudata.host.darwin-mips64.mk @@ -191,6 +191,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icudata.host.darwin-x86.mk b/icudata.host.darwin-x86.mk index 972b890..14a9e9d 100644 --- a/icudata.host.darwin-x86.mk +++ b/icudata.host.darwin-x86.mk @@ -191,6 +191,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icudata.host.darwin-x86_64.mk b/icudata.host.darwin-x86_64.mk index 7f84545..0f2f352 100644 --- a/icudata.host.darwin-x86_64.mk +++ b/icudata.host.darwin-x86_64.mk @@ -191,6 +191,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icudata.host.linux-arm.mk b/icudata.host.linux-arm.mk index 67dfa2c..dbcdd64 100644 --- a/icudata.host.linux-arm.mk +++ b/icudata.host.linux-arm.mk @@ -191,6 +191,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icudata.host.linux-arm64.mk b/icudata.host.linux-arm64.mk index f6ec3fa..5d0440c 100644 --- a/icudata.host.linux-arm64.mk +++ b/icudata.host.linux-arm64.mk @@ -189,6 +189,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icudata.host.linux-mips.mk b/icudata.host.linux-mips.mk index a741e6e..d2ed98d 100644 --- a/icudata.host.linux-mips.mk +++ b/icudata.host.linux-mips.mk @@ -193,6 +193,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icudata.host.linux-mips64.mk b/icudata.host.linux-mips64.mk index 921fb7a..7a5c3f7 100644 --- a/icudata.host.linux-mips64.mk +++ b/icudata.host.linux-mips64.mk @@ -191,6 +191,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icudata.host.linux-x86.mk b/icudata.host.linux-x86.mk index 67dfa2c..dbcdd64 100644 --- a/icudata.host.linux-x86.mk +++ b/icudata.host.linux-x86.mk @@ -191,6 +191,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icudata.host.linux-x86_64.mk b/icudata.host.linux-x86_64.mk index acdc01c..71b6ced 100644 --- a/icudata.host.linux-x86_64.mk +++ b/icudata.host.linux-x86_64.mk @@ -191,6 +191,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icui18n.host.darwin-arm.mk b/icui18n.host.darwin-arm.mk index 8d80d9e..193cad2 100644 --- a/icui18n.host.darwin-arm.mk +++ b/icui18n.host.darwin-arm.mk @@ -368,6 +368,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icui18n.host.darwin-arm64.mk b/icui18n.host.darwin-arm64.mk index 70d96ac..bfa2d7e 100644 --- a/icui18n.host.darwin-arm64.mk +++ b/icui18n.host.darwin-arm64.mk @@ -366,6 +366,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icui18n.host.darwin-mips.mk b/icui18n.host.darwin-mips.mk index b49566e..d328742 100644 --- a/icui18n.host.darwin-mips.mk +++ b/icui18n.host.darwin-mips.mk @@ -370,6 +370,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icui18n.host.darwin-mips64.mk b/icui18n.host.darwin-mips64.mk index 806e94a..8bcdf52 100644 --- a/icui18n.host.darwin-mips64.mk +++ b/icui18n.host.darwin-mips64.mk @@ -368,6 +368,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icui18n.host.darwin-x86.mk b/icui18n.host.darwin-x86.mk index 8d80d9e..193cad2 100644 --- a/icui18n.host.darwin-x86.mk +++ b/icui18n.host.darwin-x86.mk @@ -368,6 +368,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icui18n.host.darwin-x86_64.mk b/icui18n.host.darwin-x86_64.mk index 62374d1..a5c7f6c 100644 --- a/icui18n.host.darwin-x86_64.mk +++ b/icui18n.host.darwin-x86_64.mk @@ -368,6 +368,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icui18n.host.linux-arm.mk b/icui18n.host.linux-arm.mk index 8d80d9e..193cad2 100644 --- a/icui18n.host.linux-arm.mk +++ b/icui18n.host.linux-arm.mk @@ -368,6 +368,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icui18n.host.linux-arm64.mk b/icui18n.host.linux-arm64.mk index 70d96ac..bfa2d7e 100644 --- a/icui18n.host.linux-arm64.mk +++ b/icui18n.host.linux-arm64.mk @@ -366,6 +366,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icui18n.host.linux-mips.mk b/icui18n.host.linux-mips.mk index b49566e..d328742 100644 --- a/icui18n.host.linux-mips.mk +++ b/icui18n.host.linux-mips.mk @@ -370,6 +370,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icui18n.host.linux-mips64.mk b/icui18n.host.linux-mips64.mk index 806e94a..8bcdf52 100644 --- a/icui18n.host.linux-mips64.mk +++ b/icui18n.host.linux-mips64.mk @@ -368,6 +368,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icui18n.host.linux-x86.mk b/icui18n.host.linux-x86.mk index 8d80d9e..193cad2 100644 --- a/icui18n.host.linux-x86.mk +++ b/icui18n.host.linux-x86.mk @@ -368,6 +368,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icui18n.host.linux-x86_64.mk b/icui18n.host.linux-x86_64.mk index 62374d1..a5c7f6c 100644 --- a/icui18n.host.linux-x86_64.mk +++ b/icui18n.host.linux-x86_64.mk @@ -368,6 +368,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icuuc.host.darwin-arm.mk b/icuuc.host.darwin-arm.mk index f7dcd91..74e2452 100644 --- a/icuuc.host.darwin-arm.mk +++ b/icuuc.host.darwin-arm.mk @@ -377,6 +377,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icuuc.host.darwin-arm64.mk b/icuuc.host.darwin-arm64.mk index f681fe2..69c94e7 100644 --- a/icuuc.host.darwin-arm64.mk +++ b/icuuc.host.darwin-arm64.mk @@ -375,6 +375,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icuuc.host.darwin-mips.mk b/icuuc.host.darwin-mips.mk index 2e513b4..0cdef62 100644 --- a/icuuc.host.darwin-mips.mk +++ b/icuuc.host.darwin-mips.mk @@ -379,6 +379,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icuuc.host.darwin-mips64.mk b/icuuc.host.darwin-mips64.mk index 70eeca1..e55df38 100644 --- a/icuuc.host.darwin-mips64.mk +++ b/icuuc.host.darwin-mips64.mk @@ -377,6 +377,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icuuc.host.darwin-x86.mk b/icuuc.host.darwin-x86.mk index f7dcd91..74e2452 100644 --- a/icuuc.host.darwin-x86.mk +++ b/icuuc.host.darwin-x86.mk @@ -377,6 +377,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icuuc.host.darwin-x86_64.mk b/icuuc.host.darwin-x86_64.mk index 04682d1..7fd2701 100644 --- a/icuuc.host.darwin-x86_64.mk +++ b/icuuc.host.darwin-x86_64.mk @@ -377,6 +377,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icuuc.host.linux-arm.mk b/icuuc.host.linux-arm.mk index f7dcd91..74e2452 100644 --- a/icuuc.host.linux-arm.mk +++ b/icuuc.host.linux-arm.mk @@ -377,6 +377,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icuuc.host.linux-arm64.mk b/icuuc.host.linux-arm64.mk index f681fe2..69c94e7 100644 --- a/icuuc.host.linux-arm64.mk +++ b/icuuc.host.linux-arm64.mk @@ -375,6 +375,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icuuc.host.linux-mips.mk b/icuuc.host.linux-mips.mk index 2e513b4..0cdef62 100644 --- a/icuuc.host.linux-mips.mk +++ b/icuuc.host.linux-mips.mk @@ -379,6 +379,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icuuc.host.linux-mips64.mk b/icuuc.host.linux-mips64.mk index 70eeca1..e55df38 100644 --- a/icuuc.host.linux-mips64.mk +++ b/icuuc.host.linux-mips64.mk @@ -377,6 +377,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icuuc.host.linux-x86.mk b/icuuc.host.linux-x86.mk index f7dcd91..74e2452 100644 --- a/icuuc.host.linux-x86.mk +++ b/icuuc.host.linux-x86.mk @@ -377,6 +377,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/icuuc.host.linux-x86_64.mk b/icuuc.host.linux-x86_64.mk index 04682d1..7fd2701 100644 --- a/icuuc.host.linux-x86_64.mk +++ b/icuuc.host.linux-x86_64.mk @@ -377,6 +377,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. |