| Index: pylib/gyp/generator/android.py
|
| diff --git a/pylib/gyp/generator/android.py b/pylib/gyp/generator/android.py
|
| index 3c95143b9fcffc7421ca7d6b7468e65ab8785607..5d8c74e28e95fe65c6726d83cfefbe1bdf4cd286 100644
|
| --- a/pylib/gyp/generator/android.py
|
| +++ b/pylib/gyp/generator/android.py
|
| @@ -688,7 +688,7 @@ class AndroidMkWriter(object):
|
| E.g., the loadable module 'foobar' in directory 'baz' will produce
|
| '$(obj)/baz/libfoobar.so'
|
| """
|
| - if self.type == 'executable' and self.toolset == 'host':
|
| + if self.type == 'executable':
|
| # We install host executables into shared_intermediate_dir so they can be
|
| # run by gyp rules that refer to PRODUCT_DIR.
|
| path = '$(gyp_shared_intermediate_dir)'
|
| @@ -878,13 +878,9 @@ class AndroidMkWriter(object):
|
| self.WriteLn('LOCAL_PRELINK_MODULE := false')
|
| self.WriteLn('include $(BUILD_%sSHARED_LIBRARY)' % modifier)
|
| elif self.type == 'executable':
|
| - if self.toolset == 'host':
|
| - self.WriteLn('LOCAL_MODULE_PATH := $(gyp_shared_intermediate_dir)')
|
| - else:
|
| - # Don't install target executables for now, as it results in them being
|
| - # included in ROM. This can be revisited if there's a reason to install
|
| - # them later.
|
| - self.WriteLn('LOCAL_UNINSTALLABLE_MODULE := true')
|
| + # Executables are for build and test purposes only, so they're installed
|
| + # to a directory that doesn't get included in the system image.
|
| + self.WriteLn('LOCAL_MODULE_PATH := $(gyp_shared_intermediate_dir)')
|
| self.WriteLn('include $(BUILD_%sEXECUTABLE)' % modifier)
|
| else:
|
| self.WriteLn('LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp')
|
|
|