Chromium Code Reviews| Index: gni/v8.gni |
| diff --git a/gni/v8.gni b/gni/v8.gni |
| index 7ff7f6fb89ac3634a2c7ff64030805582d8c8fb9..67dc5a3b3a6d3dd453ef138205e0ea5ae1d57020 100644 |
| --- a/gni/v8.gni |
| +++ b/gni/v8.gni |
| @@ -87,13 +87,19 @@ template("v8_source_set") { |
| template("v8_executable") { |
| executable(target_name) { |
| - forward_variables_from(invoker, "*", [ "configs" ]) |
| + forward_variables_from(invoker, "*", [ "configs", "want_pie"]) |
| configs += invoker.configs |
| configs -= v8_remove_configs |
| configs += v8_add_configs |
| - if (is_linux) { |
| - # For enabling ASLR. |
| - ldflags = [ "-pie" ] |
| + if (!defined(invoker.want_pie) || invoker.want_pie) { |
| + if (is_linux) { |
| + # For enabling ASLR. |
| + ldflags = [ "-pie" ] |
| + } |
| + } else { |
| + if (is_android) { |
| + configs -= [ "//build/config/android:executable_config" ] |
|
Michael Achenbach
2016/07/27 13:15:59
This is the only change in patch 3
|
| + } |
| } |
| } |
| } |