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 ed68e6cb4588497d27ad8768bec4921a433c8ad0..fc487b8fd4ddaf6079230573950f6aec8e55ac60 100755 |
--- a/build/android/gyp/write_build_config.py |
+++ b/build/android/gyp/write_build_config.py |
@@ -213,13 +213,16 @@ def main(argv): |
c['package_name'] for c in all_resources_deps if 'package_name' in c] |
- if options.type == 'android_apk': |
- config['apk_dex'] = {} |
- dex_config = config['apk_dex'] |
+ # Dependencies for the final dex file of an apk or the standalone .dex.jar |
+ # output of a library. |
+ if options.type in ['java_library', 'android_apk']: |
+ config['final_dex'] = {} |
+ dex_config = config['final_dex'] |
# TODO(cjhopman): proguard version |
dex_deps_files = [c['dex_path'] for c in all_library_deps] |
dex_config['dependency_dex_files'] = dex_deps_files |
+ if options.type == 'android_apk': |
config['dist_jar'] = { |
'dependency_jars': [ |
c['jar_path'] for c in all_library_deps |