diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/third_party/android_platform | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/third_party/android_platform')
| -rw-r--r-- | chromium/third_party/android_platform/relocation_packer.gyp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/chromium/third_party/android_platform/relocation_packer.gyp b/chromium/third_party/android_platform/relocation_packer.gyp index cb09841fc2f..8946b365d10 100644 --- a/chromium/third_party/android_platform/relocation_packer.gyp +++ b/chromium/third_party/android_platform/relocation_packer.gyp @@ -23,6 +23,18 @@ 'bionic/tools/relocation_packer/src/sleb128_unittest.cc', 'bionic/tools/relocation_packer/src/run_all_unittests.cc', ], + 'relocation_packer_test_data_sources': [ + 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_arm32.so', + 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_arm32_packed.so', + 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_arm64.so', + 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_arm64_packed.so', + 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_ia32.so', + 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_ia32_packed.so', + 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_x64.so', + 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_x64_packed.so', + 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_mips32.so', + 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_mips32_packed.so', + ], }, 'targets': [ { @@ -51,7 +63,7 @@ ], }, { - # TODO(GN) + # GN: //third_party/android_platform:android_relocation_packer_unittests 'target_name': 'android_relocation_packer_unittests', 'toolsets': ['host'], 'type': 'executable', @@ -69,16 +81,7 @@ { 'destination': '<(PRODUCT_DIR)', 'files': [ - 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_arm32.so', - 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_arm32_packed.so', - 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_arm64.so', - 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_arm64_packed.so', - 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_ia32.so', - 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_ia32_packed.so', - 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_x64.so', - 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_x64_packed.so', - 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_mips32.so', - 'bionic/tools/relocation_packer/test_data/elf_file_unittest_relocs_mips32_packed.so', + '<@(relocation_packer_test_data_sources)' ], }, ], |