Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1094)

Unified Diff: build/android/gyp/write_build_config.py

Issue 2623243002: android: Create a GN template for create_dist_jar.py (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/config/android/internal_rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/write_build_config.py
diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py
index 6c29b8957c6fc89a79138c48acae32e04e9e0e96..d2b044a5e79c8597650afd5e9ac124514ddea06e 100755
--- a/build/android/gyp/write_build_config.py
+++ b/build/android/gyp/write_build_config.py
@@ -338,6 +338,7 @@ def main(argv):
'android_resources': ['build_config', 'resources_zip'],
'android_apk': ['build_config', 'jar_path', 'dex_path', 'resources_zip'],
'deps_dex': ['build_config', 'dex_path'],
+ 'dist_jar': ['build_config'],
'resource_rewriter': ['build_config'],
'group': ['build_config'],
}
@@ -631,14 +632,19 @@ def main(argv):
'full_classpath': java_full_classpath
}
- if options.type == 'android_apk':
+ if options.type in ('android_apk', 'dist_jar'):
dependency_jars = [c['jar_path'] for c in all_library_deps]
mbonadei1 2017/01/12 16:04:32 For the "android_library" use case I think that we
- all_interface_jars = [
- _AsInterfaceJar(p) for p in dependency_jars + [options.jar_path]]
+ all_interface_jars = [_AsInterfaceJar(p) for p in dependency_jars]
+ if options.type == 'android_apk':
+ all_interface_jars.append(_AsInterfaceJar(options.jar_path))
+
config['dist_jar'] = {
'dependency_jars': dependency_jars,
'all_interface_jars': all_interface_jars,
}
+
+ if options.type == 'android_apk':
+ dependency_jars = [c['jar_path'] for c in all_library_deps]
manifest = AndroidManifest(options.android_manifest)
deps_info['package_name'] = manifest.GetPackageName()
if not options.tested_apk_config and manifest.GetInstrumentation():
« no previous file with comments | « no previous file | build/config/android/internal_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698