import optparse
import os
import re
+import shutil
+import sys
import zipfile
import generate_v14_compatible_resources
from util import build_utils
-def ParseArgs():
+def ParseArgs(args):
"""Parses command line options.
Returns:
An options object as from optparse.OptionsParser.parse_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-tools',
parser.add_option('--dependencies-res-zips',
help='Resources from dependents.')
- parser.add_option('--R-dir', help='directory to hold generated R.java')
parser.add_option('--resource-zip-out',
help='Path for output zipped resources.')
+ parser.add_option('--R-dir',
+ help='directory to hold generated R.java.')
+ parser.add_option('--srcjar-out',
+ help='Path to srcjar to contain generated R.java.')
+
parser.add_option('--proguard-file',
help='Path to proguard.txt generated file')
parser.add_option(
'--extra-res-packages',
help='Additional package names to generate R.java files for')
+ # TODO(cjhopman): Actually use --extra-r-text-files. We currently include all
+ # the resources in all R.java files for a particular apk.
parser.add_option(
'--extra-r-text-files',
help='For each additional package, the R.txt file should contain a '
'list of resources to be included in the R.java file in the format '
'generated by aapt')
+ parser.add_option(
+ '--all-resources-zip-out',
+ help='Path for output of all resources. This includes resources in '
+ 'dependencies.')
+
parser.add_option('--stamp', help='File to touch on success')
- (options, args) = parser.parse_args()
+ (options, args) = parser.parse_args(args)
if args:
parser.error('No positional arguments should be given.')
'dependencies_res_zips',
'resource_dirs',
'resource_zip_out',
- 'R_dir',
)
build_utils.CheckOptions(options, parser, required=required_options)
- return options
+ if (options.R_dir is None) == (options.srcjar_out is None):
+ raise Exception('Exactly one of --R-dir or --srcjar-out must be specified.')
+ return options
-def CreateExtraRJavaFiles(
- r_dir, extra_packages, extra_r_text_files):
- if len(extra_packages) != len(extra_r_text_files):
- raise Exception('--extra-res-packages and --extra-r-text-files'
- 'should have the same length')
+def CreateExtraRJavaFiles(r_dir, extra_packages):
java_files = build_utils.FindInDirectory(r_dir, "R.java")
if len(java_files) != 1:
return
# affect how the code in this .apk target could refer to the resources.
-
-
-
-
def DidCrunchFail(returncode, stderr):
"""Determines whether aapt crunch failed from its return code and output.
return False
+def ZipResources(resource_dirs, zip_path):
+ # Python zipfile does not provide a way to replace a file (it just writes
+ # another file with the same name). So, first collect all the files to put
+ # in the zip (with proper overriding), and then zip them.
+ files_to_zip = dict()
+ for d in resource_dirs:
+ for root, _, files in os.walk(d):
+ for f in files:
+ archive_path = os.path.join(os.path.relpath(root, d), f)
+ path = os.path.join(root, f)
+ files_to_zip[archive_path] = path
+ with zipfile.ZipFile(zip_path, 'w') as outzip:
+ for archive_path, path in files_to_zip.iteritems():
+ outzip.write(path, archive_path)
+
+
+def CombineZips(zip_files, output_path):
+ # When packaging resources, if the top-level directories in the zip file are
+ # of the form 0, 1, ..., then each subdirectory will be passed to aapt as a
+ # resources directory. While some resources just clobber others (image files,
+ # etc), other resources (particularly .xml files) need to be more
+ # intelligently merged. That merging is left up to aapt.
+ with zipfile.ZipFile(output_path, 'w') as outzip:
+ for i, z in enumerate(zip_files):
+ with zipfile.ZipFile(z, 'r') as inzip:
+ for name in inzip.namelist():
+ new_name = '%d/%s' % (i, name)
+ outzip.writestr(new_name, inzip.read(name))
+
+
def main():
- options = ParseArgs()
+ args = build_utils.ExpandFileArgs(sys.argv[1:])
+
+ options = ParseArgs(args)
android_jar = os.path.join(options.android_sdk, 'android.jar')
aapt = os.path.join(options.android_sdk_tools, 'aapt')
- build_utils.DeleteDirectory(options.R_dir)
- build_utils.MakeDirectory(options.R_dir)
+ input_files = []
with build_utils.TempDir() as temp_dir:
deps_dir = os.path.join(temp_dir, 'deps')
v14_dir = os.path.join(temp_dir, 'v14')
build_utils.MakeDirectory(v14_dir)
+ gen_dir = os.path.join(temp_dir, 'gen')
+ build_utils.MakeDirectory(gen_dir)
+
input_resource_dirs = build_utils.ParseGypList(options.resource_dirs)
for resource_dir in input_resource_dirs:
v14_dir,
options.v14_verify_only)
+ dep_zips = build_utils.ParseGypList(options.dependencies_res_zips)
+ input_files += dep_zips
+ dep_subdirs = []
+ for z in dep_zips:
+ subdir = os.path.join(deps_dir, os.path.basename(z))
+ if os.path.exists(subdir):
+ raise Exception('Resource zip name conflict: ' + os.path.basename(z))
+ build_utils.ExtractAll(z, path=subdir)
+ dep_subdirs.append(subdir)
+
# Generate R.java. This R.java contains non-final constants and is used only
# while compiling the library jar (e.g. chromium_content.jar). When building
# an apk, a new R.java file with the correct resource -> ID mappings will be
'-M', options.android_manifest,
'--auto-add-overlay',
'-I', android_jar,
- '--output-text-symbols', options.R_dir,
- '-J', options.R_dir]
+ '--output-text-symbols', gen_dir,
+ '-J', gen_dir]
for d in input_resource_dirs:
package_command += ['-S', d]
- dep_zips = build_utils.ParseGypList(options.dependencies_res_zips)
- for z in dep_zips:
- subdir = os.path.join(deps_dir, os.path.basename(z))
- if os.path.exists(subdir):
- raise Exception('Resource zip name conflict: ' + os.path.basename(z))
- build_utils.ExtractAll(z, path=subdir)
- package_command += ['-S', subdir]
+ for d in dep_subdirs:
+ package_command += ['-S', d]
if options.non_constant_id:
package_command.append('--non-constant-id')
if options.extra_res_packages:
CreateExtraRJavaFiles(
- options.R_dir,
- build_utils.ParseGypList(options.extra_res_packages),
- build_utils.ParseGypList(options.extra_r_text_files))
+ gen_dir,
+ build_utils.ParseGypList(options.extra_res_packages))
# This is the list of directories with resources to put in the final .zip
# file. The order of these is important so that crunched/v14 resources
'-S', d]
build_utils.CheckOutput(aapt_cmd, fail_func=DidCrunchFail)
- # Python zipfile does not provide a way to replace a file (it just writes
- # another file with the same name). So, first collect all the files to put
- # in the zip (with proper overriding), and then zip them.
- files_to_zip = dict()
- for d in zip_resource_dirs:
- for root, _, files in os.walk(d):
- for f in files:
- archive_path = os.path.join(os.path.relpath(root, d), f)
- path = os.path.join(root, f)
- files_to_zip[archive_path] = path
- with zipfile.ZipFile(options.resource_zip_out, 'w') as outzip:
- for archive_path, path in files_to_zip.iteritems():
- outzip.write(path, archive_path)
-
- if options.stamp:
- build_utils.Touch(options.stamp)
+ ZipResources(zip_resource_dirs, options.resource_zip_out)
+
+ if options.all_resources_zip_out:
+ CombineZips([options.resource_zip_out] + dep_zips,
+ options.all_resources_zip_out)
+
+ if options.R_dir:
+ build_utils.DeleteDirectory(options.R_dir)
+ shutil.copytree(gen_dir, options.R_dir)
+ else:
+ build_utils.ZipDir(options.srcjar_out, gen_dir)
+
+ if options.depfile:
+ input_files += build_utils.GetPythonDependencies()
+ build_utils.WriteDepfile(options.depfile, input_files)
+
+ if options.stamp:
+ build_utils.Touch(options.stamp)
if __name__ == '__main__':
projects / platform / framework / web / crosswalk.git / blobdiff