Revert 281286 "Add gyp machinery to build with packed ARM relati..."

trunk/src/build/java_apk.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 30 matching lines @@
 #  native_lib_target - The target_name of the target which generates the final
 #    shared library to be included in this apk. A stripped copy of the
 #    library will be included in the apk.
 #  resource_dir - The directory for resources.
 #  R_package - A custom Java package to generate the resource file R.java in.
 #    By default, the package given in AndroidManifest.xml will be used.
 #  use_chromium_linker - Enable the content dynamic linker that allows sharing the
 #    RELRO section of the native libraries between the different processes.
 #  load_library_from_zip_file - When using the dynamic linker, load the library
 #    directly out of the zip file.
-#  use_relocation_packer - Enable relocation packing. Relies on the chromium
-#    linker, so use_chromium_linker must also be enabled.
 #  enable_chromium_linker_tests - Enable the content dynamic linker test support
 #    code. This allows a test APK to inject a Linker.TestRunner instance at
 #    runtime. Should only be used by the chromium_linker_test_apk target!!
 #  never_lint - Set to 1 to not run lint on this target.
 {
   'variables': {
     'tested_apk_obfuscated_jar_path%': '/',
     'tested_apk_dex_path%': '/',
     'additional_input_paths': [],
     'input_jars_paths': [],
@@ skipping 27 matching lines @@
     'native_libraries_template_data_file': '<(native_libraries_template_data_dir)/native_libraries_array.h',
     'native_libraries_template_version_file': '<(native_libraries_template_data_dir)/native_libraries_version.h',
     'compile_stamp': '<(intermediate_dir)/compile.stamp',
     'lint_stamp': '<(intermediate_dir)/lint.stamp',
     'lint_result': '<(intermediate_dir)/lint_result.xml',
     'lint_config': '<(intermediate_dir)/lint_config.xml',
     'never_lint%': 0,
     'instr_stamp': '<(intermediate_dir)/instr.stamp',
     'jar_stamp': '<(intermediate_dir)/jar.stamp',
     'obfuscate_stamp': '<(intermediate_dir)/obfuscate.stamp',
-    'pack_arm_relocations_stamp': '<(intermediate_dir)/pack_arm_relocations.stamp',
     'strip_stamp': '<(intermediate_dir)/strip.stamp',
-    'stripped_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)/stripped_libraries',
     'classes_dir': '<(intermediate_dir)/classes/2',
     'javac_includes': [],
     'jar_excluded_classes': [],
     'javac_jar_path': '<(intermediate_dir)/<(_target_name).javac.jar',
     'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
     'obfuscated_jar_path': '<(intermediate_dir)/obfuscated.jar',
     'test_jar_path': '<(PRODUCT_DIR)/test.lib.java/<(apk_name).jar',
     'dex_path': '<(intermediate_dir)/classes.dex',
     'emma_device_jar': '<(android_sdk_root)/tools/lib/emma_device.jar',
     'android_manifest_path%': '<(java_in_dir)/AndroidManifest.xml',
@@ skipping 11 matching lines @@
     'symlink_script_host_path': '<(intermediate_dir)/create_symlinks.sh',
     'symlink_script_device_path': '<(device_intermediate_dir)/create_symlinks.sh',
     'create_standalone_apk%': 1,
     'res_v14_verify_only%': 0,
     'variables': {
       'variables': {
         'native_lib_target%': '',
         'native_lib_version_name%': '',
         'use_chromium_linker%' : 0,
         'load_library_from_zip_file%' : 0,
-        'use_relocation_packer%' : 0,
         'enable_chromium_linker_tests%': 0,
         'is_test_apk%': 0,
       },
       'conditions': [
         ['gyp_managed_install == 1 and native_lib_target != ""', {
           'unsigned_standalone_apk_path': '<(intermediate_dir)/<(apk_name)-standalone-unsigned.apk',
         }, {
           'unsigned_standalone_apk_path': '<(unsigned_apk_path)',
         }],
         ['gyp_managed_install == 1', {
           'apk_package_native_libs_dir': '<(intermediate_dir)/libs.managed',
         }, {
           'apk_package_native_libs_dir': '<(intermediate_dir)/libs',
         }],
         ['is_test_apk == 0 and emma_coverage != 0', {
           'emma_instrument%': 1,
         },{
           'emma_instrument%': 0,
         }],
       ],
     },
     'native_lib_target%': '',
     'native_lib_version_name%': '',
     'use_chromium_linker%' : 0,
+    'enable_chromium_linker_tests%': 0,
     'load_library_from_zip_file%' : 0,
-    'use_relocation_packer%' : 0,
-    'enable_chromium_linker_tests%': 0,
     'emma_instrument%': '<(emma_instrument)',
     'apk_package_native_libs_dir': '<(apk_package_native_libs_dir)',
     'unsigned_standalone_apk_path': '<(unsigned_standalone_apk_path)',
-    'libchromium_android_linker': 'libchromium_android_linker.>(android_product_extension)',
     'extra_native_libs': [],
   },
   # 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
   # cannot be lifted in a dependent to all_dependent_settings.
   'all_dependent_settings': {
     'conditions': [
       ['proguard_enabled == "true"', {
         'variables': {
           'proguard_enabled': 'true',
@@ skipping 51 matching lines @@
           ],
         },
       ],
       'actions': [
         {
           'variables': {
             'conditions': [
               ['use_chromium_linker == 1', {
                 'variables': {
                   'linker_input_libraries': [
-                    '<(SHARED_LIB_DIR)/<(libchromium_android_linker)',
+                    '<(SHARED_LIB_DIR)/libchromium_android_linker.>(android_product_extension)',
                   ],
                 }
               }, {
                 'variables': {
                   'linker_input_libraries': [],
                 },
               }],
             ],
             'input_libraries': [
               '<@(native_libs_paths)',
@@ skipping 84 matching lines @@
             '--output=<(native_libraries_java_file)',
             '--template=<(native_libraries_template)',
             '--stamp=<(native_libraries_java_stamp)',
             '<@(gcc_preprocess_defines)',
           ],
         },
         {
           'action_name': 'strip_native_libraries',
           'variables': {
             'ordered_libraries_file%': '<(ordered_libraries_file)',
-            'stripped_libraries_dir%': '<(stripped_libraries_dir)',
+            'stripped_libraries_dir': '<(libraries_source_dir)',
             'input_paths': [
               '<@(native_libs_paths)',
               '<@(extra_native_libs)',
             ],
             'stamp': '<(strip_stamp)'
           },
           'includes': ['../build/android/strip_native_libraries.gypi'],
         },
-        {
-          'action_name': 'pack_arm_relocations',
-          'variables': {
-            'conditions': [
-              ['use_chromium_linker == 1 and use_relocation_packer == 1', {
-                'enable_packing': 1,
-              }, {
-                'enable_packing': 0,
-              }],
-            ],
-            'exclude_packing_list': [
-              '<(libchromium_android_linker)',
-            ],
-            'ordered_libraries_file%': '<(ordered_libraries_file)',
-            'stripped_libraries_dir%': '<(stripped_libraries_dir)',
-            'packed_libraries_dir': '<(libraries_source_dir)',
-            'input_paths': [
-              '<(strip_stamp)',
-            ],
-            'stamp': '<(pack_arm_relocations_stamp)',
-          },
-          'dependencies': [
-            'strip_native_libraries',
-          ],
-          'includes': ['../build/android/pack_arm_relocations.gypi'],
-        },
       ],
       'conditions': [
         ['gyp_managed_install == 1', {
           'variables': {
             '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',
             'configuration_name': '<(CONFIGURATION_NAME)',
           },
           'dependencies': [
@@ skipping 461 matching lines @@
         '-DEMMA_INSTRUMENT=<(emma_instrument)',
         '-DEMMA_DEVICE_JAR=<(emma_device_jar)',
 
         '-Dbasedir=.',
         '-buildfile',
         '<(DEPTH)/build/android/ant/apk-package.xml',
       ]
     },
   ],
 }