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

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

Issue 2724093003: Android: Add missing resources to android studio (Closed)
Patch Set: Moving third_party changes to separate CL. Created 3 years, 9 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 | « build/android/gradle/generate_gradle.py ('k') | no next file » | 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 b90f06f8d58701ef46c3c801543c0ba63c66649a..5c6c721ce7ba77623ba486a585aac16b20337ca0 100755
--- a/build/android/gyp/write_build_config.py
+++ b/build/android/gyp/write_build_config.py
@@ -374,6 +374,7 @@ def main(argv):
direct_library_deps = deps.Direct('java_library')
all_library_deps = deps.All('java_library')
+ direct_resources_deps = deps.Direct('android_resources')
all_resources_deps = deps.All('android_resources')
# Resources should be ordered with the highest-level dependency first so that
# overrides are done correctly.
@@ -478,8 +479,11 @@ def main(argv):
c['package_name'] for c in all_resources_deps if 'package_name' in c]
if options.type == 'android_apk':
- # Apks will get their resources srcjar explicitly passed to the java step.
+ # Apks will get their resources srcjar explicitly passed to the java step
config['javac']['srcjars'] = []
+ # Gradle may need to generate resources for some apks.
+ gradle['srcjars'] = [
+ c['srcjar'] for c in direct_resources_deps if 'srcjar' in c]
if options.type == 'android_assets':
all_asset_sources = []
« no previous file with comments | « build/android/gradle/generate_gradle.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698