Upstream version 10.38.220.0

[platform/framework/web/crosswalk.git] / src / build / java_apk.gypi

diff --git a/src/build/java_apk.gypi b/src/build/java_apk.gypi
index be5033b..78be893 100644 (file)
--- a/src/build/java_apk.gypi
+++ b/src/build/java_apk.gypi
@@ -169,6 +169,8 @@
     'unsigned_standalone_apk_path': '<(unsigned_standalone_apk_path)',
     'libchromium_android_linker': 'libchromium_android_linker.>(android_product_extension)',
     'extra_native_libs': [],
+    'native_lib_placeholder_stamp': '<(apk_package_native_libs_dir)/<(android_app_abi)/native_lib_placeholder.stamp',
+    'native_lib_placeholders': [],
   },
   # Pass the jar path to the apk's "fake" jar target.  This would be better as
   # direct_dependent_settings, but a variable set by a direct_dependent_settings
@@ -399,15 +401,35 @@
           },
           'includes': ['../build/android/strip_native_libraries.gypi'],
         },
+        {
+          'action_name': 'Create native lib placeholder files for previous releases',
+          'variables': {
+            'placeholders': ['<@(native_lib_placeholders)'],
+            'conditions': [
+              ['gyp_managed_install == 1', {
+                # This "library" just needs to be put in the .apk. It is not loaded
+                # at runtime.
+                'placeholders': ['libfix.crbug.384638.so'],
+              }]
+            ],
+          },
+          'inputs': [
+            '<(DEPTH)/build/android/gyp/create_placeholder_files.py',
+          ],
+          'outputs': [
+            '<(native_lib_placeholder_stamp)',
+          ],
+          'action': [
+            'python', '<(DEPTH)/build/android/gyp/create_placeholder_files.py',
+            '--dest-lib-dir=<(apk_package_native_libs_dir)/<(android_app_abi)/',
+            '--stamp=<(native_lib_placeholder_stamp)',
+            '<@(placeholders)',
+          ],
+        },
       ],
       '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',
@@ -421,19 +443,6 @@
               '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': [
@@ -882,6 +891,11 @@
       'outputs': [
         '<(unsigned_apk_path)',
       ],
+      'conditions': [
+        ['native_lib_target != ""', {
+          'inputs': ['<(native_lib_placeholder_stamp)'],
+        }],
+      ],
       'action': [
         'python', '<(DEPTH)/build/android/gyp/ant.py',
         '--',