Index: gni/v8.gni |
diff --git a/gni/v8.gni b/gni/v8.gni |
index 5aac4e333a26feae5cb10c2551f8f24b3a260f6d..3ed3c25bc8edfd6105a85b125dcf3fe0bd464ee3 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) { |
jochen (gone - plz use gerrit)
2016/07/27 07:41:31
instead of using want_pie, why not just never usin
Michael Achenbach
2016/07/27 07:46:09
I don't know here if I target the host. I only kno
|
+ if (is_linux) { |
+ # For enabling ASLR. |
+ ldflags = [ "-pie" ] |
+ } |
+ } else { |
+ if (is_android) { |
+ configs -= "//build/config/android:executable_config" |
Michael Achenbach
2016/07/27 13:11:00
Meh: sorry for the half-baked CL. Forgot []
|
+ } |
} |
} |
} |