Specify jar name for apks in java_apk.gypi

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 49 matching lines @@
     'input_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%': '',
     'native_libs_paths': [],
     'manifest_package_name%': 'unknown.package.name',
     'resource_dir%':'',
+    'jar_name%': 'chromium_apk_<(package_name).jar',
   },
   'sources': [
       '<@(native_libs_paths)'
   ],
+  # 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)',
+    },
+  },
   'rules': [
     {
       'rule_name': 'copy_and_strip_native_libraries',
       'extension': 'so',
       'variables': {
         'stripped_library_path': '<(PRODUCT_DIR)/<(package_name)/libs/<(android_app_abi)/<(RULE_INPUT_ROOT).so',
         'link_dir': '<(android_product_out)/symbols/data/data/<(manifest_package_name)/lib/',
       },
       'outputs': [
         '<(stripped_library_path)',
@@ skipping 46 matching lines @@
         '-DANDROID_TOOLCHAIN=<(android_toolchain)',
         '-DCHROMIUM_SRC=<(ant_build_out)/../..',
         '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',
         '-DPRODUCT_DIR=<(ant_build_out)',
 
         '-DAPK_NAME=<(apk_name)',
         '-DASSET_DIR=<(asset_location)',
         '-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)',
         '-DGENERATED_SRC_DIRS=>(generated_src_dirs)',
         '-DINPUT_JARS_PATHS=>(input_jars_paths)',
+        '-DJAR_NAME=<(jar_name)',
         '-DPACKAGE_NAME=<(package_name)',
         '-DRESOURCE_DIR=<(resource_dir)',
         '-DAPP_MANIFEST_VERSION_NAME=<(app_manifest_version_name)',
         '-DAPP_MANIFEST_VERSION_CODE=<(app_manifest_version_code)',
         '-DPROGUARD_FLAGS=>(proguard_flags)',
         '-DPROGUARD_ENABLED=>(proguard_enabled)',
 
         '-Dbasedir=<(java_in_dir)',
         '-buildfile',
         '<(DEPTH)/build/android/ant/chromium-apk.xml',
 
         # Specify CONFIGURATION_NAME as the target for ant to build. The
         # buildfile will then build the appropriate SDK tools target.
         '<(CONFIGURATION_NAME)',
       ]
     },
   ],
 }