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

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

Issue 1483683002: GN(android): Use list of libraries rather than native_lib_dir in all places (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review coments Created 5 years 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/gyp/apkbuilder.py ('k') | build/android/incremental_install/create_install_script.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/pack_relocations.py
diff --git a/build/android/gyp/pack_relocations.py b/build/android/gyp/pack_relocations.py
index e1122653a2ef87be9cfd036e801be45f1651693b..1a4824ae671c13419f731f4306b4dda10ff90703 100755
--- a/build/android/gyp/pack_relocations.py
+++ b/build/android/gyp/pack_relocations.py
@@ -64,6 +64,8 @@ def main(args):
parser.add_option('--libraries', action='append',
help='List of libraries')
parser.add_option('--stamp', help='Path to touch on success')
+ parser.add_option('--filelistjson',
+ help='Output path of filelist.json to write')
options, _ = parser.parse_args(args)
enable_packing = (options.enable_packing == '1' and
@@ -80,10 +82,12 @@ def main(args):
build_utils.MakeDirectory(options.packed_libraries_dir)
+ output_paths = []
for library in libraries:
library_path = os.path.join(options.stripped_libraries_dir, library)
output_path = os.path.join(
options.packed_libraries_dir, os.path.basename(library))
+ output_paths.append(output_path)
if enable_packing and library not in exclude_packing_set:
PackLibraryRelocations(options.android_pack_relocations,
@@ -92,6 +96,9 @@ def main(args):
else:
CopyLibraryUnchanged(library_path, output_path)
+ if options.filelistjson:
+ build_utils.WriteJson({ 'files': output_paths }, options.filelistjson)
+
if options.depfile:
build_utils.WriteDepfile(
options.depfile,
« no previous file with comments | « build/android/gyp/apkbuilder.py ('k') | build/android/incremental_install/create_install_script.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698