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

Unified Diff: build/android/strip_native_libraries.gypi

Issue 14844009: [Android] Only always trigger stripping with component build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unwanted line Created 7 years, 7 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/native_app_dependencies.gypi ('k') | build/java_apk.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/strip_native_libraries.gypi
diff --git a/build/android/strip_native_libraries.gypi b/build/android/strip_native_libraries.gypi
index d35a5b887ec4bcc86657a188e5d5600a72fea768..57de0afd4f4a2d0bb5655e0f2205e1347dd24ae3 100644
--- a/build/android/strip_native_libraries.gypi
+++ b/build/android/strip_native_libraries.gypi
@@ -7,11 +7,12 @@
#
# To use this, create a gyp target with the following form:
# {
+# 'action_name': 'strip_native_libraries',
# 'actions': [
# 'variables': {
# 'ordered_libraries_file': 'file generated by write_ordered_libraries'
# 'input_paths': 'files to be added to the list of inputs'
-# 'strip_stamp': 'file to touch when the action is complete'
+# 'stamp': 'file to touch when the action is complete'
# 'stripped_libraries_dir': 'directory to store stripped libraries',
# },
# 'includes': [ '../../build/android/strip_native_libraries.gypi' ],
@@ -20,7 +21,6 @@
#
{
- 'action_name': 'strip_native_libraries',
'message': 'Stripping libraries for <(_target_name)',
'variables': {
'input_paths': [],
@@ -32,11 +32,15 @@
'>@(input_paths)',
],
'outputs': [
- '<(strip_stamp)',
- # Add a fake output to force the build to always re-run this step. This
- # is required because the real inputs are not known at gyp-time and
- # changing base.so may not trigger changes to dependent libraries.
- '<(strip_stamp).fake',
+ '<(stamp)',
+ ],
+ 'conditions': [
+ ['component == "shared_library"', {
+ # Add a fake output to force the build to always re-run this step. This
+ # is required because the real inputs are not known at gyp-time and
+ # changing base.so may not trigger changes to dependent libraries.
+ 'outputs': [ '<(stamp).fake' ]
+ }],
],
'action': [
'python', '<(DEPTH)/build/android/gyp/strip_library_for_device.py',
@@ -45,6 +49,6 @@
'--stripped-libraries-dir=<(stripped_libraries_dir)',
'--libraries-dir=<(SHARED_LIB_DIR)',
'--libraries-file=<(ordered_libraries_file)',
- '--stamp=<(strip_stamp)',
+ '--stamp=<(stamp)',
],
}
« no previous file with comments | « build/android/native_app_dependencies.gypi ('k') | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698