Using alternative_android_sdk_jar in process_resources, package_resources

build/android/gyp/package_resources.py

Index: build/android/gyp/package_resources.py
diff --git a/build/android/gyp/package_resources.py b/build/android/gyp/package_resources.py
index a1f3840cfd49721c760d46cc66fd08759960d697..536d5e5cb9417e55061069112fe446007c414f6d 100755
--- a/build/android/gyp/package_resources.py
+++ b/build/android/gyp/package_resources.py
@@ -80,7 +80,8 @@ def _ParseArgs(args):
   """
   parser = optparse.OptionParser()
   build_utils.AddDepfileOption(parser)
-  parser.add_option('--android-sdk', help='path to the Android SDK folder')
+  parser.add_option('--android-sdk-jar',
+                    help='path to the Android SDK jar.')
   parser.add_option('--aapt-path',
                     help='path to the Android aapt tool')
 
@@ -123,7 +124,7 @@ def _ParseArgs(args):
     parser.error('No positional arguments should be given.')
 
   # Check that required options have been provided.
-  required_options = ('android_sdk', 'aapt_path', 'configuration_name',
+  required_options = ('android_sdk_jar', 'aapt_path', 'configuration_name',
                       'android_manifest', 'version_code', 'version_name',
                       'apk_path')
 
@@ -226,7 +227,7 @@ def _ConstructMostAaptArgs(options):
       '--no-crunch',
       '-f',
       '--auto-add-overlay',
-      '-I', os.path.join(options.android_sdk, 'android.jar'),
+      '-I', options.android_sdk_jar,
       '-F', options.apk_path,
       '--ignore-assets', build_utils.AAPT_IGNORE_PATTERN,
   ]