[gyp][Android] Implement TestGypAndroid.run_built_executable.

pylib/gyp/generator/android.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Notes:
 #
 # This generates makefiles suitable for inclusion into the Android build system
 # via an Android.mk file. It is based on make.py, the standard makefile
 # generator.
 #
@@ skipping 670 matching lines @@
     """
     return ''.join(self.ComputeOutputParts(spec))
 
 
   def ComputeOutput(self, spec):
     """Return the 'output' (full output path) of a gyp spec.
 
     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)'
     elif self.type == 'shared_library':
       if self.toolset == 'host':
         path = '$(HOST_OUT_INTERMEDIATE_LIBRARIES)'
       else:
         path = '$($(GYP_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)'
     else:
       # Other targets just get built into their intermediate dir.
@@ skipping 169 matching lines @@
     # NOTE: This has to come last!
     modifier = ''
     if self.toolset == 'host':
       modifier = 'HOST_'
     if self.type == 'static_library':
       self.WriteLn('include $(BUILD_%sSTATIC_LIBRARY)' % modifier)
     elif self.type == 'shared_library':
       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')
+      self.WriteLn('LOCAL_MODULE_PATH := $(gyp_shared_intermediate_dir)')

[Torne, 2014/06/12 09:38:49]

We probably want a comment here to explain that we expect executables to be for
build/test purposes only, which is why we're installing target executables to a
path that won't actually be included in the system image. This might surprise
someone later ;)

       self.WriteLn('include $(BUILD_%sEXECUTABLE)' % modifier)
     else:
       self.WriteLn('LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp')
       self.WriteLn('LOCAL_UNINSTALLABLE_MODULE := true')
       if self.toolset == 'target':
         self.WriteLn('LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)')
       self.WriteLn()
       self.WriteLn('include $(BUILD_SYSTEM)/base_rules.mk')
       self.WriteLn()
       self.WriteLn('$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)')
@@ skipping 190 matching lines @@
   # Write out the sorted list of includes.
   root_makefile.write('\n')
   for include_file in sorted(include_list):
     root_makefile.write('include $(LOCAL_PATH)/' + include_file + '\n')
   root_makefile.write('\n')
 
   if write_alias_targets:
     root_makefile.write(ALL_MODULES_FOOTER)
 
   root_makefile.close()