[Android] Support building standalone APK in component build

build/java_apk.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 42 matching lines @@
   'variables': {
     'additional_input_paths': [],
     'input_jars_paths': [],
     'library_dexed_jars_paths': [],
     'additional_src_dirs': [],
     'generated_src_dirs': [],
     'app_manifest_version_name%': '<(android_app_version_name)',
     'app_manifest_version_code%': '<(android_app_version_code)',
     'proguard_enabled%': 'false',
     'proguard_flags_paths%': ['<(DEPTH)/build/android/empty_proguard.flags'],
-    'native_lib_target%': '',
     'jar_name': 'chromium_apk_<(_target_name).jar',
     'resource_dir%':'<(DEPTH)/build/android/ant/empty/res',
     'R_package%':'',
     'additional_R_text_files': [],
     'additional_res_dirs': [],
     'additional_res_packages': [],
     'is_test_apk%': 0,
     'java_strings_grd%': '',
     'library_manifest_paths' : [],
     'resource_input_paths': [],
@@ skipping 21 matching lines @@
     'javac_includes': [],
     'jar_excluded_classes': [],
     'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
     'obfuscated_jar_path': '<(intermediate_dir)/obfuscated.jar',
     'dex_path': '<(intermediate_dir)/classes.dex',
     'android_manifest_path%': '<(java_in_dir)/AndroidManifest.xml',
     'push_stamp': '<(intermediate_dir)/push.stamp',
     'link_stamp': '<(intermediate_dir)/link.stamp',
     'package_resources_stamp': '<(intermediate_dir)/package_resources.stamp',
     'codegen_input_paths': [],
-    'keystore_path': '<(DEPTH)/build/android/ant/chromium-debug.keystore',
     'unsigned_apk_path': '<(intermediate_dir)/<(apk_name)-unsigned.apk',
     'final_apk_path%': '<(PRODUCT_DIR)/apks/<(apk_name).apk',
+    'incomplete_apk_path': '<(intermediate_dir)/<(apk_name)-incomplete.apk',
     'source_dir': '<(java_in_dir)/src',
     'apk_install_record': '<(intermediate_dir)/apk_install.record.stamp',
     'device_intermediate_dir': '/data/local/tmp/chromium/<(_target_name)/<(CONFIGURATION_NAME)',
     'symlink_script_host_path': '<(intermediate_dir)/create_symlinks.sh',
     'symlink_script_device_path': '<(device_intermediate_dir)/create_symlinks.sh',
+    'create_standalone_apk%': 1,
     'variables': {
+      'variables': {
+        'native_lib_target%': '',
+      },
       'conditions': [
+        ['gyp_managed_install == 1 and native_lib_target != ""', {
+          'unsigned_standalone_apk_path': '<(intermediate_dir)/<(apk_name)-standalone-unsigned.apk',
+        }, {
+          'unsigned_standalone_apk_path': '<(unsigned_apk_path)',
+        }],
         ['gyp_managed_install == 1', {
           'apk_package_native_libs_dir': '<(intermediate_dir)/libs.managed',
         }, {
           'apk_package_native_libs_dir': '<(intermediate_dir)/libs',
         }],
       ],
     },
+    'native_lib_target%': '',
     'apk_package_native_libs_dir': '<(apk_package_native_libs_dir)',
+    'unsigned_standalone_apk_path': '<(unsigned_standalone_apk_path)',
   },
   # Pass the jar path to the apk's "fake" jar target.  This would be better as
   # direct_dependent_settings, but a variable set by a direct_dependent_settings
   # cannot be lifted in a dependent to all_dependent_settings.
   'all_dependent_settings': {
     'variables': {
       'apk_output_jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
     },
   },
   'conditions': [
@@ skipping 90 matching lines @@
             'stripped_libraries_dir': '<(libraries_source_dir)',
             'input_paths': ['<@(native_libs_paths)'],
             'stamp': '<(strip_stamp)'
           },
           'includes': ['../build/android/strip_native_libraries.gypi'],
         },
       ],
       'conditions': [
         ['gyp_managed_install == 1', {
           'variables': {
-            'libraries_source_dir': '<(intermediate_dir)/lib.stripped/<(android_app_abi)',
+            'libraries_top_dir': '<(intermediate_dir)/lib.stripped',
+            'libraries_source_dir': '<(libraries_top_dir)/lib/<(android_app_abi)',
             'device_library_dir': '<(device_intermediate_dir)/lib.stripped',
           },
           'dependencies': [
             '<(DEPTH)/tools/android/md5sum/md5sum.gyp:md5sum',
           ],
           'actions': [
             {
               'includes': ['../build/android/push_libraries.gypi'],
             },
             {
               'action_name': 'create device library symlinks',
               'message': 'Creating links on device for <(_target_name).',
               'inputs': [
                 '<(DEPTH)/build/android/gyp/util/build_utils.py',
                 '<(DEPTH)/build/android/gyp/create_device_library_links.py',
                 '<(apk_install_record)',
                 '<(ordered_libraries_file)',
               ],
               'outputs': [
                 '<(link_stamp)'
               ],
               'action': [
                 'python', '<(DEPTH)/build/android/gyp/create_device_library_links.py',
                 '--libraries-json=<(ordered_libraries_file)',
                 '--script-host-path=<(symlink_script_host_path)',
                 '--script-device-path=<(symlink_script_device_path)',
                 '--target-dir=<(device_library_dir)',
-                '--apk=<(final_apk_path)',
+                '--apk=<(incomplete_apk_path)',
                 '--stamp=<(link_stamp)',
               ],
             },
           ],
+          'conditions': [
+            ['create_standalone_apk == 1', {
+              'actions': [
+                {
+                  'action_name': 'create standalone APK',
+                  'variables': {
+                    'inputs': [
+                      '<(ordered_libraries_file)',
+                      '<(strip_stamp)',
+                    ],
+                    'input_apk_path': '<(unsigned_apk_path)',
+                    'output_apk_path': '<(unsigned_standalone_apk_path)',
+                    'libraries_top_dir%': '<(libraries_top_dir)',
+                  },
+                  'includes': [ 'android/create_standalone_apk_action.gypi' ],
+                },
+              ],
+            }],
+          ],
         }, {
           # gyp_managed_install != 1
           'variables': {
             'libraries_source_dir': '<(apk_package_native_libs_dir)/<(android_app_abi)',
             'package_input_paths': [ '<(strip_stamp)' ],
           },
         }],
       ],
     }], # native_lib_target != ''
+    ['gyp_managed_install == 0 or create_standalone_apk == 1', {
+      'actions': [
+        {
+          'action_name': 'finalize standalone apk',
+          'variables': {
+            'input_apk_path': '<(unsigned_standalone_apk_path)',
+            'output_apk_path': '<(final_apk_path)',
+          },
+          'includes': [ 'android/finalize_apk_action.gypi']
+        },
+      ],
+    }],
     ['java_strings_grd != ""', {
       'variables': {
         'res_grit_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)_apk/res_grit',
         'additional_res_dirs': ['<(res_grit_dir)'],
         # grit_grd_file is used by grit_action.gypi, included below.
         'grit_grd_file': '<(java_in_dir)/strings/<(java_strings_grd)',
         'resource_input_paths': [
           '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(res_grit_dir)" <(grit_grd_file))'
         ],
       },
       'actions': [
         {
           'action_name': 'generate_localized_strings_xml',
           'variables': {
             'grit_additional_defines': ['-E', 'ANDROID_JAVA_TAGGED_ONLY=false'],
             'grit_out_dir': '<(res_grit_dir)',
             # resource_ids is unneeded since we don't generate .h headers.
             'grit_resource_ids': '',
           },
           'includes': ['../build/grit_action.gypi'],
         },
       ],
     }],
     ['gyp_managed_install == 1', {
       'actions': [
         {
+          'action_name': 'finalize incomplete apk',
+          'variables': {
+            'input_apk_path': '<(unsigned_apk_path)',
+            'output_apk_path': '<(incomplete_apk_path)',
+          },
+          'includes': [ 'android/finalize_apk_action.gypi']
+        },
+        {
           'action_name': 'apk_install_<(_target_name)',
           'message': 'Installing <(apk_name).apk',
           'inputs': [
             '<(DEPTH)/build/android/gyp/util/build_utils.py',
             '<(DEPTH)/build/android/gyp/apk_install.py',
-            '<(final_apk_path)',
+            '<(incomplete_apk_path)',
           ],
           'outputs': [
             '<(apk_install_record)',
             # If a user switches the connected device, the APK may need to be
             # installed even if there have been no changes. To ensure that the
             # APK on the device is always up-to-date, this step should always
             # be triggered.
             '<(apk_install_record).fake',
           ],
           'action': [
             'python', '<(DEPTH)/build/android/gyp/apk_install.py',
             '--android-sdk-tools=<(android_sdk_tools)',
-            '--apk-path=<(final_apk_path)',
+            '--apk-path=<(incomplete_apk_path)',
             '--install-record=<(apk_install_record)'
           ],
         },
       ],
     }],
   ],
   'actions': [
     {
       'action_name': 'ant_codegen_<(_target_name)',
       'message': 'Generating R.java for <(_target_name)',
@@ skipping 246 matching lines @@
         '-Dbasedir=.',
         '-buildfile',
         '<(DEPTH)/build/android/ant/apk-package.xml',
 
         # Add list of inputs to the command line, so if inputs change
         # (e.g. if a Java file is removed), the command will be re-run.
         # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
         '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)',
       ]
     },
-    {
-      'action_name': 'finalize_apk',
-      'message': 'Signing/aligning <(_target_name) APK.',
-      'inputs': [
-        '<(DEPTH)/build/android/gyp/util/build_utils.py',
-        '<(DEPTH)/build/android/gyp/finalize_apk.py',
-        '<(unsigned_apk_path)',
-      ],
-      'outputs': [
-        '<(final_apk_path)',
-      ],
-      'action': [
-        'python', '<(DEPTH)/build/android/gyp/finalize_apk.py',
-        '--android-sdk-root=<(android_sdk_root)',
-        '--unsigned-apk-path=<(unsigned_apk_path)',
-        '--final-apk-path=<(final_apk_path)',
-        '--keystore-path=<(keystore_path)',
-
-        # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
-        '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
-      ],
-    },
   ],
 }