| Index: chrome/android/chrome_apk.gypi | 
| diff --git a/chrome/android/chrome_apk.gypi b/chrome/android/chrome_apk.gypi | 
| new file mode 100644 | 
| index 0000000000000000000000000000000000000000..fb679f4124667181f6ee8fab0b7e8e09e606806f | 
| --- /dev/null | 
| +++ b/chrome/android/chrome_apk.gypi | 
| @@ -0,0 +1,48 @@ | 
| +# Copyright 2015 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. | 
| +{ | 
| +  'variables': { | 
| +    'variables': { | 
| +      'native_lib_placeholders_file%': '', | 
| +      'chrome_apk_use_relocation_packer%': 1, | 
| +      'conditions': [ | 
| +        # Use the chromium linker unless cygprofile instrumentation is active. | 
| +        # Chromium linker causes instrumentation to return incorrect results. | 
| +        ['order_profiling == 0', { | 
| +          'chrome_apk_use_chromium_linker%': 1, | 
| +          'chrome_apk_load_library_from_zip%': 1, | 
| +        }, { | 
| +          'chrome_apk_use_chromium_linker%': 0, | 
| +          'chrome_apk_load_library_from_zip%': 0, | 
| +        }], | 
| +      ], | 
| +    }, | 
| +    'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)', | 
| +    'java_in_dir_suffix': '/src_dummy', | 
| +    'native_lib_version_name': '<(version_full)', | 
| +    'proguard_enabled': 'true', | 
| +    'proguard_flags_paths': ['<(DEPTH)/chrome/android/java_staging/proguard.flags'], | 
| +    'additional_input_paths' : ['<@(chrome_android_pak_output_resources)'], | 
| +    'conditions': [ | 
| +      ['component != "shared_library"', { | 
| +        # Only enable the chromium linker on regular builds, since the | 
| +        # component build crashes on Android 4.4. See b/11379966 | 
| +        'use_chromium_linker': '<(chrome_apk_use_chromium_linker)', | 
| +        'conditions': [ | 
| +          ['"<(native_lib_placeholders_file)" != ""', { | 
| +            'native_lib_placeholders': ['<!@(cat <(native_lib_placeholders_file))'], | 
| +          }], | 
| +          # Only attempt relocation packing for 32-bit and 64-bit arm builds | 
| +          # that enable the chromium linker. Packing is a no-op if this | 
| +          # is not a Release build. | 
| +          ['chrome_apk_use_chromium_linker == 1 and (target_arch == "arm" or target_arch == "arm64")', { | 
| +            'use_relocation_packer': '<(chrome_apk_use_relocation_packer)', | 
| +          }], | 
| +        ], | 
| +      }], | 
| +    ], | 
| +    'run_findbugs': 0, | 
| +  }, | 
| +  'includes': [ '../../build/java_apk.gypi' ], | 
| +} | 
|  |