| Index: tools/android/file_poller/file_poller.gyp
|
| diff --git a/tools/android/file_poller/file_poller.gyp b/tools/android/file_poller/file_poller.gyp
|
| index 319054c3a85ddb076c826ebf3681c64ccfc24a13..097344d2d29937d49bae28f12b937aadab8db3f6 100644
|
| --- a/tools/android/file_poller/file_poller.gyp
|
| +++ b/tools/android/file_poller/file_poller.gyp
|
| @@ -10,19 +10,6 @@
|
| 'dependencies': [
|
| '../../../base/base.gyp:base',
|
| ],
|
| - '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': [
|
| 'file_poller.cc',
|
| ],
|
|
|