| Index: ppapi/ppapi_nacl_test_common.gypi
|
| diff --git a/ppapi/ppapi_nacl_test_common.gypi b/ppapi/ppapi_nacl_test_common.gypi
|
| deleted file mode 100644
|
| index 9d06affbe7550a952036d4fa866825a76b3b7fbd..0000000000000000000000000000000000000000
|
| --- a/ppapi/ppapi_nacl_test_common.gypi
|
| +++ /dev/null
|
| @@ -1,285 +0,0 @@
|
| -# Copyright (c) 2013 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.
|
| -
|
| -{
|
| - 'includes': [
|
| - '../build/common_untrusted.gypi',
|
| - ],
|
| - 'target_defaults': {
|
| - # We need to override the variables in untrusted.gypi outside of a
|
| - # target_condition block because the target_condition block in
|
| - # untrusted gypi is fully evaluated and interpolated before any of the
|
| - # target_condition blocks in this file are expanded. This means that any
|
| - # variables overriden inside a target_condition block in this file will not
|
| - # affect the values in untrusted.gypi.
|
| - 'variables': {
|
| - 'nacl_untrusted_build': 1,
|
| - 'test_files': [],
|
| - 'generate_nmf%': 1,
|
| - 'nacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/newlib',
|
| - 'nacl_glibc_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/glibc',
|
| - 'nacl_pnacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/pnacl',
|
| - 'nacl_pnacl_newlib_nonsfi_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/nonsfi',
|
| - 'target_conditions': [
|
| - ['nexe_target!=""', {
|
| - # These variables are used for nexe building and for library building.
|
| - 'out_newlib32%': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_32.nexe',
|
| - 'out_newlib64%': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_64.nexe',
|
| - 'out_newlib_arm%': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_arm.nexe',
|
| - 'out_newlib_mips%': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_mips32.nexe',
|
| - 'nmf_newlib%': '>(nacl_newlib_out_dir)/>(nexe_target).nmf',
|
| - 'out_glibc32%': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_32.nexe',
|
| - 'out_glibc64%': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_64.nexe',
|
| - 'out_glibc_arm%': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_arm.nexe',
|
| - 'nmf_glibc%': '>(nacl_glibc_out_dir)/>(nexe_target).nmf',
|
| - 'out_pnacl_newlib%': '>(nacl_pnacl_newlib_out_dir)/>(nexe_target)_newlib_pnacl.pexe',
|
| - 'nmf_pnacl_newlib%': '>(nacl_pnacl_newlib_out_dir)/>(nexe_target).nmf',
|
| - 'out_pnacl_newlib_x86_32_nonsfi_nexe': '>(nacl_pnacl_newlib_nonsfi_out_dir)/>(nexe_target)_pnacl_newlib_x32_nonsfi.nexe',
|
| - 'out_pnacl_newlib_arm_nonsfi_nexe': '>(nacl_pnacl_newlib_nonsfi_out_dir)/>(nexe_target)_pnacl_newlib_arm_nonsfi.nexe',
|
| - 'nmf_pnacl_newlib_nonsfi%': '>(nacl_pnacl_newlib_nonsfi_out_dir)/>(nexe_target).nmf',
|
| - }],
|
| - ],
|
| - },
|
| - 'dependencies': [
|
| - '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
|
| - '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_lib',
|
| - '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
|
| - '<(DEPTH)/ppapi/ppapi_nacl.gyp:nacl_elf_loader',
|
| - '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
|
| - ],
|
| - 'target_conditions': [
|
| - ['test_files!=[] and build_newlib==1', {
|
| - 'copies': [
|
| - {
|
| - 'destination': '>(nacl_newlib_out_dir)',
|
| - 'files': [
|
| - '>@(test_files)',
|
| - ],
|
| - },
|
| - ],
|
| - }],
|
| - ['test_files!=[] and "<(target_arch)"!="mipsel" and disable_glibc==0 and build_glibc==1', {
|
| - 'copies': [
|
| - {
|
| - 'destination': '>(nacl_glibc_out_dir)',
|
| - 'files': [
|
| - '>@(test_files)',
|
| - ],
|
| - },
|
| - ],
|
| - }],
|
| - # Nonsfi pnacl copy is covered below.
|
| - ['test_files!=[] and build_pnacl_newlib==1 and disable_pnacl==0', {
|
| - 'copies': [
|
| - {
|
| - 'destination': '>(nacl_pnacl_newlib_out_dir)',
|
| - 'files': [
|
| - '>@(test_files)',
|
| - ],
|
| - },
|
| - ],
|
| - }],
|
| - ['test_files!=[] and build_pnacl_newlib==1 and (enable_x86_32_nonsfi==1 or enable_arm_nonsfi==1)', {
|
| - 'copies': [
|
| - {
|
| - 'destination': '>(nacl_pnacl_newlib_nonsfi_out_dir)',
|
| - 'files': [
|
| - '>@(test_files)',
|
| - ],
|
| - },
|
| - ],
|
| - }],
|
| - ['nexe_target!=""', {
|
| - 'variables': {
|
| - # Patch over the fact that untrusted.gypi doesn't define these in all
|
| - # cases.
|
| - 'enable_x86_64%': 0,
|
| - 'enable_x86_32%': 0,
|
| - 'enable_arm%': 0,
|
| - 'enable_mips%': 0,
|
| - 'include_dirs': [
|
| - '<(DEPTH)',
|
| - ],
|
| - 'link_flags': [
|
| - '-lppapi_cpp',
|
| - '-lppapi',
|
| - '-pthread',
|
| - ],
|
| - 'extra_args': [
|
| - '--strip-all',
|
| - ],
|
| - 'variables': {
|
| - 'conditions': [
|
| - ['target_arch=="arm"', {
|
| - 'objdump': '>(nacl_glibc_tc_root)/bin/arm-nacl-objdump'
|
| - }, {
|
| - 'objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump'
|
| - }],
|
| - ]
|
| - },
|
| - 'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
|
| - 'create_nmf_args_portable%': [],
|
| - 'create_nonsfi_test_nmf': '<(DEPTH)/ppapi/tests/create_nonsfi_test_nmf.py',
|
| - 'create_nmf_args': [
|
| - '--no-default-libpath',
|
| - '--objdump=<(objdump)',
|
| - ],
|
| - },
|
| - 'target_conditions': [
|
| - ['generate_nmf==1 and build_newlib==1 and disable_newlib==0', {
|
| - 'actions': [
|
| - {
|
| - 'action_name': 'Generate NEWLIB NMF',
|
| - 'inputs': ['>(create_nmf)'],
|
| - 'outputs': ['>(nmf_newlib)'],
|
| - 'action': [
|
| - 'python',
|
| - '>(create_nmf)',
|
| - '>@(create_nmf_args)',
|
| - '--output=>(nmf_newlib)',
|
| - '>@(create_nmf_args_portable)',
|
| - ],
|
| - 'target_conditions': [
|
| - ['enable_x86_64==1', {
|
| - 'inputs': ['>(out_newlib64)'],
|
| - 'action': ['>(out_newlib64)'],
|
| - }],
|
| - ['enable_x86_32==1', {
|
| - 'inputs': ['>(out_newlib32)'],
|
| - 'action': ['>(out_newlib32)'],
|
| - }],
|
| - ['enable_arm==1', {
|
| - 'inputs': ['>(out_newlib_arm)'],
|
| - 'action': ['>(out_newlib_arm)'],
|
| - }],
|
| - ['enable_mips==1', {
|
| - 'inputs': ['>(out_newlib_mips)'],
|
| - 'action': ['>(out_newlib_mips)'],
|
| - }],
|
| - ],
|
| - },
|
| - ],
|
| - }],
|
| - ['"<(target_arch)"!="mipsel" and generate_nmf==1 and disable_glibc==0 and build_glibc==1', {
|
| - 'variables': {
|
| - # NOTE: Use /lib, not /lib64 here; it is a symbolic link which
|
| - # doesn't work on Windows.
|
| - 'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib',
|
| - 'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32',
|
| - 'libdir_glibc_arm': '>(nacl_glibc_tc_root)/arm-nacl/lib',
|
| - },
|
| - 'actions': [
|
| - {
|
| - 'action_name': 'Generate GLIBC NMF and copy libs',
|
| - 'inputs': ['>(create_nmf)'],
|
| - # NOTE: There is no explicit dependency for the lib32
|
| - # and lib64 directories created in the PRODUCT_DIR.
|
| - # They are created as a side-effect of NMF creation.
|
| - 'outputs': ['>(nmf_glibc)'],
|
| - 'action': [
|
| - 'python',
|
| - '>@(_inputs)',
|
| - '>@(create_nmf_args)',
|
| - '--output=>(nmf_glibc)',
|
| - '--path-prefix=>(nexe_target)_libs',
|
| - '--stage-dependencies=<(nacl_glibc_out_dir)',
|
| - '>@(create_nmf_args_portable)',
|
| - ],
|
| - 'target_conditions': [
|
| - ['enable_x86_64==1', {
|
| - 'inputs': ['>(out_glibc64)'],
|
| - 'action': [
|
| - '--library-path=>(libdir_glibc64)',
|
| - '--library-path=>(tc_lib_dir_glibc64)',
|
| - ],
|
| - }],
|
| - ['enable_x86_32==1', {
|
| - 'inputs': ['>(out_glibc32)'],
|
| - 'action': [
|
| - '--library-path=>(libdir_glibc32)',
|
| - '--library-path=>(tc_lib_dir_glibc32)',
|
| - ],
|
| - }],
|
| - ['enable_arm==1', {
|
| - 'inputs': ['>(out_glibc_arm)'],
|
| - 'action': [
|
| - '--library-path=>(libdir_glibc_arm)',
|
| - '--library-path=>(tc_lib_dir_glibc_arm)',
|
| - ],
|
| - }],
|
| - ],
|
| - },
|
| - ],
|
| - }],
|
| - ['generate_nmf==1 and build_pnacl_newlib==1 and disable_pnacl==0', {
|
| - 'actions': [
|
| - {
|
| - 'action_name': 'Generate PNACL NEWLIB NMF',
|
| - # NOTE: create_nmf must be first, it is the script python
|
| - # executes below.
|
| - 'inputs': ['>(create_nmf)', '>(out_pnacl_newlib)'],
|
| - 'outputs': ['>(nmf_pnacl_newlib)'],
|
| - 'action': [
|
| - 'python',
|
| - '>(create_nmf)',
|
| - '>@(create_nmf_args)',
|
| - '--output=>(nmf_pnacl_newlib)',
|
| - '>(out_pnacl_newlib)',
|
| - '>@(create_nmf_args_portable)',
|
| - ],
|
| - },
|
| - ],
|
| - }],
|
| - ['generate_nmf==1 and build_pnacl_newlib==1 and disable_pnacl==0 and (enable_x86_32_nonsfi==1 or enable_arm_nonsfi==1)', {
|
| - 'actions': [
|
| - {
|
| - 'action_name': 'Generate PNACL NEWLIB nonsfi NMF',
|
| - 'inputs': ['>(create_nonsfi_test_nmf)'],
|
| - 'outputs': ['>(nmf_pnacl_newlib_nonsfi)'],
|
| - 'action': [
|
| - 'python',
|
| - '>(create_nonsfi_test_nmf)',
|
| - '>@(create_nmf_args_portable)',
|
| - '--output=>(nmf_pnacl_newlib_nonsfi)',
|
| - ],
|
| - 'target_conditions': [
|
| - ['enable_x86_32_nonsfi==1 and "<(target_arch)"=="ia32"', {
|
| - 'inputs': ['>(out_pnacl_newlib_x86_32_nonsfi_nexe)'],
|
| - 'action': [
|
| - '--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)',
|
| - '--arch=x86-32',
|
| - ]
|
| - }],
|
| - ['enable_x86_32_nonsfi==1 and "<(target_arch)"=="x64"', {
|
| - 'inputs': ['>(out_pnacl_newlib_x86_32_nonsfi_nexe)'],
|
| - 'action': [
|
| - '--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)',
|
| - # This should be used only for nacl_helper_nonsfi test.
|
| - # In theory this should be x86-32. However, currently
|
| - # fallback logic to x86-32-nonsfi is not implemented,
|
| - # and, moreover, it would break the tests for current
|
| - # nacl_helper in Non-SFI mode on x64 Chrome.
|
| - # So, here we introduce the hack to use "x86-64" in order
|
| - # to take the benefit to run nacl_helper_nonsfi tests on
|
| - # x64 Chrome.
|
| - # TODO(hidehiko): Remove this hack.
|
| - '--arch=x86-64',
|
| - ]
|
| - }],
|
| - ['enable_arm_nonsfi==1', {
|
| - 'inputs': ['>(out_pnacl_newlib_arm_nonsfi_nexe)'],
|
| - 'action': [
|
| - '--program=>(out_pnacl_newlib_arm_nonsfi_nexe)',
|
| - '--arch=arm',
|
| - ]
|
| - }],
|
| - ],
|
| - },
|
| - ],
|
| - }],
|
| - ],
|
| - }],
|
| - ],
|
| - },
|
| -}
|
|
|
Chromium Code Reviews
Issue 2289983002:
Remove PPAPI gyp files. (Closed)
