Index: build/android/gradle/generate_gradle.py |
diff --git a/build/android/gradle/generate_gradle.py b/build/android/gradle/generate_gradle.py |
index d57dfa9fb14485f73ee4503ff31369107f672f49..93aaa67abaf1636d45cf2842f310a5c4f45d3754 100755 |
--- a/build/android/gradle/generate_gradle.py |
+++ b/build/android/gradle/generate_gradle.py |
@@ -35,6 +35,8 @@ _SRCJARS_SUBDIR = 'extracted-srcjars' |
_JNI_LIBS_SUBDIR = 'symlinked-libs' |
_ARMEABI_SUBDIR = 'armeabi' |
_RES_SUBDIR = 'extracted-res' |
+_GRADLE_BUILD_FILE = 'build.gradle' |
+_PSEUDO_NAME = 'a_pseudo_module' |
agrieve
2017/04/12 19:36:29
nit: is the "a" need to be there so it comes alpha
Peter Wen
2017/04/13 17:23:16
Added comment, changed to _all
|
_DEFAULT_TARGETS = [ |
# TODO(agrieve): .build_config seem not quite right for this target |
@@ -237,6 +239,10 @@ class _ProjectEntry(object): |
class _ProjectContextGenerator(object): |
+ |
+ java_dirs = set() |
agrieve
2017/04/12 19:36:29
This is a singleton class, so it's a bit confusing
Peter Wen
2017/04/13 17:23:17
Done.
|
+ prebuilts = set() |
+ |
"""Helper class to generate gradle build files""" |
def __init__(self, project_dir, build_vars, use_gradle_process_resources, |
jinja_processor, split_projects): |
@@ -334,14 +340,17 @@ class _ProjectContextGenerator(object): |
# things up at all. |
variables = {} |
java_dirs, excludes = self._GenJavaDirs(root_entry) |
+ java_dirs.append( |
+ os.path.join(self.EntryOutputDir(root_entry), _SRCJARS_SUBDIR)) |
+ self.java_dirs.update(java_dirs) |
java_dirs.sort() |
variables['java_dirs'] = self._Relativize(root_entry, java_dirs) |
- variables['java_dirs'].append(_SRCJARS_SUBDIR) |
variables['java_excludes'] = excludes |
variables['jni_libs'] = self._Relativize( |
root_entry, set(self._GenJniLibs(root_entry))) |
variables['prebuilts'] = [ |
p for e in self._GetEntries(root_entry) for p in e.PrebuiltJars()] |
+ self.prebuilts.update(variables['prebuilts']) |
variables['res_dirs'] = [ |
p for e in self._GetEntries(root_entry) for p in e.ResDirs()] |
for entry in self._GetEntries(root_entry): |
@@ -538,12 +547,50 @@ def _GenerateGradleFile(entry, generator, build_vars, jinja_processor): |
_TemplatePath(target_type.split('_')[0]), variables) |
+def _GeneratePseudoModule(gradle_output_dir, generator, build_vars, |
+ jinja_processor): |
+ """Returns the data for a pseudo build.gradle of all dirs.""" |
agrieve
2017/04/12 19:36:29
what makes it pseudo? Is it not a real module? May
Peter Wen
2017/04/13 17:23:17
Changed name to "All"
|
+ |
+ variables = { |
+ 'sourceSetName': 'main', |
+ 'depCompileName': 'compile', |
+ 'target_name': _PSEUDO_NAME, |
+ } |
+ target_type = 'android_apk' |
+ variables['template_type'] = target_type |
+ variables['use_gradle_process_resources'] = ( |
+ generator.use_gradle_process_resources) |
+ source_properties = _ReadPropertiesFile( |
agrieve
2017/04/12 19:36:29
Please figure out how to re-use rather than copy &
Peter Wen
2017/04/13 17:23:17
Done.
|
+ _RebasePath(os.path.join(build_vars['android_sdk_build_tools'], |
+ 'source.properties'))) |
+ variables['build_tools_version'] = source_properties['Pkg.Revision'] |
+ variables['compile_sdk_version'] = ( |
+ 'android-%s' % build_vars['android_sdk_version']) |
+ def Relativize(paths): |
+ return _RebasePath(paths, os.path.join(gradle_output_dir, _PSEUDO_NAME)) |
+ java_dirs = list(_ProjectContextGenerator.java_dirs) |
+ java_dirs.sort() |
+ prebuilts = list(_ProjectContextGenerator.prebuilts) |
+ prebuilts.sort() |
+ variables['main'] = { |
+ 'android_manifest': Relativize(_DEFAULT_ANDROID_MANIFEST_PATH), |
+ 'java_dirs': Relativize(java_dirs), |
+ 'prebuilts': Relativize(prebuilts), |
+ 'java_excludes': ['**/*.java'], |
+ # TODO(wnwen): exclude everything |
+ } |
+ data = jinja_processor.Render( |
+ _TemplatePath(target_type.split('_')[0]), variables) |
+ _WriteFile( |
+ os.path.join(gradle_output_dir, _PSEUDO_NAME, _GRADLE_BUILD_FILE), data) |
+ |
+ |
def _GenerateRootGradle(jinja_processor): |
"""Returns the data for the root project's build.gradle.""" |
return jinja_processor.Render(_TemplatePath('root')) |
-def _GenerateSettingsGradle(project_entries): |
+def _GenerateSettingsGradle(project_entries, avoid_pseudo_module): |
"""Returns the data for settings.gradle.""" |
project_name = os.path.basename(os.path.dirname(host_paths.DIR_SOURCE_ROOT)) |
lines = [] |
@@ -552,6 +599,11 @@ def _GenerateSettingsGradle(project_entries): |
lines.append('rootProject.projectDir = settingsDir') |
lines.append('') |
+ if not avoid_pseudo_module: |
+ lines.append('include ":{0}"'.format(_PSEUDO_NAME)) |
+ lines.append( |
+ 'project(":{0}").projectDir = new File(settingsDir, "{0}")'.format( |
+ _PSEUDO_NAME)) |
for entry in project_entries: |
# Example target: android_webview:android_webview_java__build_config |
lines.append('include ":%s"' % entry.ProjectName()) |
@@ -653,6 +705,10 @@ def main(): |
action='store_true', |
help='Split projects by their gn deps rather than ' |
'combining all the dependencies of each target') |
+ parser.add_argument('--avoid-pseudo-module', |
+ action='store_true', |
+ help='Prevent an overall pseudo module from being ' |
agrieve
2017/04/12 19:36:29
Please explain why you might ever want to do this
Peter Wen
2017/04/13 17:23:16
Removed.
Hmm... just an escape hatch I added, not
|
+ 'generated (not applicable to split projects)') |
args = parser.parse_args() |
if args.output_directory: |
constants.SetOutputDirectory(args.output_directory) |
@@ -662,9 +718,10 @@ def main(): |
run_tests_helper.SetLogLevel(args.verbose_count) |
# TODO(wnwen): Fix packaging so that gradle resources work in this case. |
- if args.use_gradle_process_resources: |
- assert args.split_projects, ( |
- 'Gradle resources does not yet work without --split-projects.') |
+ if args.split_projects: |
+ args.avoid_pseudo_module = True |
+ assert not args.use_gradle_process_resources, ( |
+ 'Gradle resources does not work without --split-projects.') |
_gradle_output_dir = os.path.abspath( |
args.project_dir.replace('$CHROMIUM_OUTPUT_DIR', output_dir)) |
@@ -696,7 +753,10 @@ def main(): |
# There are many unused libraries, so restrict to those that are actually used |
# when using --all. |
if args.all: |
- main_entries = [e for e in main_entries if e.GetType() == 'android_apk'] |
+ main_entries = [e for e in main_entries if ( |
+ e.GetType() == 'android_apk' or |
+ e.GnTarget().endswith('_test_apk__apk') or |
+ e.GnTarget().endswith('_junit_tests__java_binary'))] |
if args.split_projects: |
main_entries = _FindAllProjectEntries(main_entries) |
@@ -724,13 +784,18 @@ def main(): |
(s, os.path.join(generator.EntryOutputDir(entry), _RES_SUBDIR)) |
for s in generator.AllResZips(entry)) |
_WriteFile( |
- os.path.join(generator.EntryOutputDir(entry), 'build.gradle'), data) |
+ os.path.join(generator.EntryOutputDir(entry), _GRADLE_BUILD_FILE), |
+ data) |
+ |
+ if not args.avoid_pseudo_module: |
+ _GeneratePseudoModule( |
+ _gradle_output_dir, generator, build_vars, jinja_processor) |
- _WriteFile(os.path.join(generator.project_dir, 'build.gradle'), |
+ _WriteFile(os.path.join(generator.project_dir, _GRADLE_BUILD_FILE), |
_GenerateRootGradle(jinja_processor)) |
_WriteFile(os.path.join(generator.project_dir, 'settings.gradle'), |
- _GenerateSettingsGradle(project_entries)) |
+ _GenerateSettingsGradle(project_entries, args.avoid_pseudo_module)) |
sdk_path = _RebasePath(build_vars['android_sdk_root']) |
_WriteFile(os.path.join(generator.project_dir, 'local.properties'), |