Skip to content

Commit

Permalink
[Android] Add native library to strip inputs
Browse files Browse the repository at this point in the history
If the native library changes, we should re-strip/copy it. Add it to the inputs
so that we do that.

BUG=158821

Review URL: https://chromiumcodereview.appspot.com/13852037

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195274 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
cjhopman@chromium.org committed Apr 19, 2013
1 parent 5310a69 commit 3da7ac8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
3 changes: 3 additions & 0 deletions build/android/native_app_dependencies.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
'includes': ['../../build/android/write_ordered_libraries.gypi'],
},
{
'variables': {
'input_paths': ['<(native_binary)'],
},
'includes': ['../../build/android/strip_native_libraries.gypi'],
},
],
Expand Down
7 changes: 6 additions & 1 deletion build/android/strip_native_libraries.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# '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'
# 'stripped_libraries_dir': 'directory to store stripped libraries',
# },
Expand All @@ -21,10 +22,14 @@
{
'action_name': 'strip_native_libraries',
'message': 'Stripping libraries for <(_target_name)',
'variables': {
'input_paths': [],
},
'inputs': [
'<(DEPTH)/build/android/gyp/util/build_utils.py',
'<(DEPTH)/build/android/gyp/strip_library_for_device.py',
'<(ordered_libraries_file)'
'<(ordered_libraries_file)',
'>@(input_paths)',
],
'outputs': [
'<(strip_stamp)',
Expand Down
1 change: 1 addition & 0 deletions build/java_apk.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@
{
'variables': {
'stripped_libraries_dir': '<(libraries_source_dir)',
'input_paths': ['<@(native_libs_paths)'],
},
'includes': ['../build/android/strip_native_libraries.gypi'],
},
Expand Down

0 comments on commit 3da7ac8

Please sign in to comment.