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

Unified Diff: android_webview/android_webview.gyp

Issue 11096038: Move shared library copy and strip to java_apk.gypi (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Workaround make generator bug Created 8 years, 2 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 | build/android/prepare_library_for_apk » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/android_webview.gyp
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index db03ff326356b4a7206f91fb0e35e700f04277b1..4f8105d4459842daa0f7d40f929128ba16589105 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -126,9 +126,10 @@
'variables': {
'package_name': 'android_webview',
'apk_name': 'AndroidWebView',
+ 'manifest_package_name': 'org.chromium.android_webview',
'java_in_dir': '../android_webview/java',
'resource_dir': '../res',
- 'native_libs_paths': ['<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so'],
+ 'native_libs_paths': ['<(SHARED_LIB_DIR)/libwebview.so'],
'input_pak_files': [
'<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
'<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
@@ -143,20 +144,6 @@
],
'additional_input_paths': [ '<@(copied_pak_files)' ],
},
- 'actions': [
- {
- 'action_name': 'copy_and_strip_so',
- 'inputs': ['<(SHARED_LIB_DIR)/libwebview.so'],
- 'outputs': ['<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so'],
- 'action': [
- '<(android_strip)',
- '--strip-unneeded', # All symbols not needed for relocation.
- '<@(_inputs)',
- '-o',
- '<@(_outputs)',
- ],
- },
- ],
'copies': [
{
'destination': '<(PRODUCT_DIR)/android_webview/assets',
« no previous file with comments | « no previous file | build/android/prepare_library_for_apk » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698