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

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

Issue 2091303002: 🎉 Fix missing ninja dependency between .apk and component shared libs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/apkbuilder.py
diff --git a/build/android/gyp/apkbuilder.py b/build/android/gyp/apkbuilder.py
index ef5f2cfbd8cfdd6480aa4dea51d36f9211ec6f25..71be5a1d29775842fec7f2e4c64ff40bef7e9a2b 100755
--- a/build/android/gyp/apkbuilder.py
+++ b/build/android/gyp/apkbuilder.py
@@ -182,11 +182,15 @@ def main(args):
native_libs = sorted(options.native_libs)
input_paths = [options.resource_apk, __file__] + native_libs
+ # Include native libs in the depfile_deps since GN doesn't know about the
+ # dependencies when is_component_build=true.
+ depfile_deps = list(native_libs)
secondary_native_libs = []
if options.secondary_native_libs:
secondary_native_libs = sorted(options.secondary_native_libs)
input_paths += secondary_native_libs
+ depfile_deps += secondary_native_libs
if options.dex_file:
input_paths.append(options.dex_file)
@@ -299,7 +303,8 @@ def main(args):
options,
input_paths=input_paths,
input_strings=input_strings,
- output_paths=[options.output_apk])
+ output_paths=[options.output_apk],
+ depfile_deps=depfile_deps)
if __name__ == '__main__':
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698