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

Unified Diff: build/java_apk.gypi

Issue 330203006: Add an empty native library to gyp_managed_install's incomplete apks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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/gyp/touch.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 9465279437a7d445c571c8d01fb37cc00cfcd66f..d22cfe145979efb13daef269c9f010b6d794d926 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -403,6 +403,11 @@
'conditions': [
['gyp_managed_install == 1', {
'variables': {
+ # This "library" just needs to be put in the .apk. It is not loaded
+ # at runtime.
+ 'placeholder_native_library_path':
+ '<(apk_package_native_libs_dir)/<(android_app_abi)/libfix.crbug.384638.so',
+ 'package_input_paths': [ '<(placeholder_native_library_path)' ],
'libraries_top_dir': '<(intermediate_dir)/lib.stripped',
'libraries_source_dir': '<(libraries_top_dir)/lib/<(android_app_abi)',
'device_library_dir': '<(device_intermediate_dir)/lib.stripped',
@@ -416,6 +421,19 @@
'includes': ['../build/android/push_libraries.gypi'],
},
{
+ 'action_name': 'create placeholder lib',
+ 'inputs': [
+ '<(DEPTH)/build/android/gyp/touch.py',
+ ],
+ 'outputs': [
+ '<(placeholder_native_library_path)',
+ ],
+ 'action' : [
+ 'python', '<(DEPTH)/build/android/gyp/touch.py',
+ '<@(_outputs)',
+ ],
+ },
+ {
'action_name': 'create device library symlinks',
'message': 'Creating links on device for <(_target_name)',
'inputs': [
« no previous file with comments | « build/android/gyp/touch.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698