| Index: tools/android/forwarder2/forwarder.gyp
|
| diff --git a/tools/android/forwarder2/forwarder.gyp b/tools/android/forwarder2/forwarder.gyp
|
| index 03496a64a137295432d5b243da2f5299f3d6b40e..fbf5eba6f2f0ebdf3825a467e29a3ce806893be1 100644
|
| --- a/tools/android/forwarder2/forwarder.gyp
|
| +++ b/tools/android/forwarder2/forwarder.gyp
|
| @@ -30,19 +30,6 @@
|
| 'include_dirs': [
|
| '../../..',
|
| ],
|
| - 'conditions': [
|
| - # Warning: A PIE tool cannot run on ICS 4.0.4, so only
|
| - # build it as position-independent when ASAN
|
| - # is activated. See b/6587214 for details.
|
| - [ 'asan==1', {
|
| - 'cflags': [
|
| - '-fPIE',
|
| - ],
|
| - 'ldflags': [
|
| - '-pie',
|
| - ],
|
| - }],
|
| - ],
|
| 'sources': [
|
| 'command.cc',
|
| 'common.cc',
|
|
|