Roll Mojo to b88737ed62969ce3203085748f0d53ff4f09ba5b.

build/android/gyp/process_resources.py

Index: build/android/gyp/process_resources.py
diff --git a/build/android/gyp/process_resources.py b/build/android/gyp/process_resources.py
index 2ac9d6e05d398ca7598248aafb2277dca0a05fc3..d227954ae96af22f748c6ab35b16780a5e1fa522 100755
--- a/build/android/gyp/process_resources.py
+++ b/build/android/gyp/process_resources.py
@@ -23,9 +23,8 @@ import generate_v14_compatible_resources
 from util import build_utils
 
 # Import jinja2 from third_party/jinja2
-sys.path.insert(1, os.path.join(
-    os.path.dirname(__file__),
-    '../../../third_party/mojo/src/mojo/public/third_party'))
+sys.path.insert(1,
+    os.path.join(os.path.dirname(__file__), '../../../third_party'))
 from jinja2 import Template # pylint: disable=F0401
 
 
@@ -39,8 +38,8 @@ def ParseArgs(args):
   build_utils.AddDepfileOption(parser)
 
   parser.add_option('--android-sdk', help='path to the Android SDK folder')
-  parser.add_option('--android-sdk-tools',
-                    help='path to the Android SDK build tools folder')
+  parser.add_option('--aapt-path',
+                    help='path to the Android aapt tool')
   parser.add_option('--non-constant-id', action='store_true')
 
   parser.add_option('--android-manifest', help='AndroidManifest.xml path')
@@ -103,7 +102,7 @@ def ParseArgs(args):
   # Check that required options have been provided.
   required_options = (
       'android_sdk',
-      'android_sdk_tools',
+      'aapt_path',
       'android_manifest',
       'dependencies_res_zips',
       'resource_dirs',
@@ -304,7 +303,7 @@ def main():
 
   options = ParseArgs(args)
   android_jar = os.path.join(options.android_sdk, 'android.jar')
-  aapt = os.path.join(options.android_sdk_tools, 'aapt')
+  aapt = options.aapt_path
 
   input_files = []