Make aapt and aidl paths flexible.

Android-M sdk moved these build-tools to a different directory and so we need to be able to set them in GYP_DEFINES for M sdk builds. BUG=None Review URL: https://codereview.chromium.org/1162943008 Cr-Commit-Position: refs/heads/master@{#332959}
Denger-Network · Jun 4, 2015 · 2a145da · 2a145da
1 parent 21740f6
commit 2a145da
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 17 deletions.
diff --git a/build/android/gyp/package_resources.py b/build/android/gyp/package_resources.py
@@ -71,8 +71,8 @@ def ParseArgs():
   parser = optparse.OptionParser()
   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('--configuration-name',
                     help='Gyp\'s configuration name (Debug or Release).')
@@ -105,7 +105,7 @@ def ParseArgs():
     parser.error('No positional arguments should be given.')
 
   # Check that required options have been provided.
-  required_options = ('android_sdk', 'android_sdk_tools', 'configuration_name',
+  required_options = ('android_sdk', 'aapt_path', 'configuration_name',
                       'android_manifest', 'version_code', 'version_name',
                       'apk_path')
 
@@ -187,7 +187,7 @@ def CheckDensityMissedConfigs(apk_path):
 def main():
   options = ParseArgs()
   android_jar = os.path.join(options.android_sdk, 'android.jar')
-  aapt = os.path.join(options.android_sdk_tools, 'aapt')
+  aapt = options.aapt_path
 
   with build_utils.TempDir() as temp_dir:
     package_command = [aapt,

diff --git a/build/android/gyp/process_resources.py b/build/android/gyp/process_resources.py
@@ -38,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')
@@ -102,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',
@@ -303,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 = []
 

diff --git a/build/android/package_resources_action.gypi b/build/android/package_resources_action.gypi
@@ -45,7 +45,7 @@
   'action': [
     'python', '<(DEPTH)/build/android/gyp/package_resources.py',
     '--android-sdk', '<(android_sdk)',
-    '--android-sdk-tools', '<(android_sdk_tools)',
+    '--aapt-path', '<(android_aapt_path)',
     '--configuration-name', '<(CONFIGURATION_NAME)',
     '--android-manifest', '<(android_manifest_path)',
     '--version-code', '<(app_manifest_version_code)',

diff --git a/build/common.gypi b/build/common.gypi
@@ -1692,7 +1692,7 @@
           'host_os%': '<(host_os)',
 
           'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_version)',
-          # Android SDK build tools (e.g. dx, aapt, aidl)
+          # Android SDK build tools (e.g. dx, aidl)
           'android_sdk_tools%': '<(android_sdk_root)/build-tools/<(android_sdk_build_tools_version)',
 
           # Android API level 16 is JB (Android 4.1) which is the minimum
@@ -1761,6 +1761,7 @@
         'android_ndk_include': '<(android_ndk_sysroot)/usr/include',
         'android_ndk_lib': '<(android_ndk_sysroot)/<(android_ndk_lib_dir)',
         'android_sdk_tools%': '<(android_sdk_tools)',
+        'android_aapt_path%': '<(android_sdk_tools)/aapt',
         'android_sdk%': '<(android_sdk)',
         'android_sdk_jar%': '<(android_sdk)/android.jar',
 

diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
@@ -13,6 +13,7 @@ rebased_android_sdk_build_tools =
 
 android_sdk_jar = "$android_sdk/android.jar"
 rebased_android_sdk_jar = rebase_path(android_sdk_jar, root_build_dir)
+android_aapt_path = "$rebased_android_sdk_build_tools/aapt"
 
 template("android_lint") {
   set_sources_assignment_filter([])
@@ -635,8 +636,8 @@ template("create_apk") {
       rebase_path(depfile, root_build_dir),
       "--android-sdk",
       rebased_android_sdk,
-      "--android-sdk-tools",
-      rebased_android_sdk_build_tools,
+      "--aapt-path",
+      android_aapt_path,
       "--configuration-name=$_configuration_name",
       "--android-manifest",
       rebase_path(_android_manifest, root_build_dir),
@@ -1264,8 +1265,8 @@ template("process_resources") {
       rebase_path(depfile, root_build_dir),
       "--android-sdk",
       rebase_path(android_sdk, root_build_dir),
-      "--android-sdk-tools",
-      rebase_path(android_sdk_build_tools, root_build_dir),
+      "--aapt-path",
+      android_aapt_path,
       "--android-manifest",
       rebase_path(android_manifest, root_build_dir),
       "--resource-dirs=$rebase_resource_dirs",

diff --git a/build/java.gypi b/build/java.gypi
@@ -176,7 +176,7 @@
           'action': [
             'python', '<(DEPTH)/build/android/gyp/process_resources.py',
             '--android-sdk', '<(android_sdk)',
-            '--android-sdk-tools', '<(android_sdk_tools)',
+            '--aapt-path', '<(android_aapt_path)',
             '--non-constant-id',
 
             '--android-manifest', '<(android_manifest)',

diff --git a/build/java_aidl.gypi b/build/java_aidl.gypi
@@ -35,6 +35,7 @@
 
 {
   'variables': {
+    'aidl_path%': '<(android_sdk_tools)/aidl',
     'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/aidl',
     'aidl_import_include%': '',
     'additional_aidl_arguments': [],
@@ -66,7 +67,7 @@
         '<(intermediate_dir)/<(RULE_INPUT_ROOT).java',
       ],
       'action': [
-        '<(android_sdk_tools)/aidl',
+        '<(aidl_path)',
         '-p<(android_sdk)/framework.aidl',
         '-p<(aidl_interface_file)',
         '<@(additional_aidl_arguments)',

diff --git a/build/java_apk.gypi b/build/java_apk.gypi
@@ -768,7 +768,7 @@
       'action': [
         'python', '<(DEPTH)/build/android/gyp/process_resources.py',
         '--android-sdk', '<(android_sdk)',
-        '--android-sdk-tools', '<(android_sdk_tools)',
+        '--aapt-path', '<(android_aapt_path)',
 
         '--android-manifest', '<(android_manifest_path)',
         '--dependencies-res-zips', '>(dependencies_res_zip_paths)',