| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'conditions': [ | 6 'conditions': [ |
| 7 ['OS=="android"', { | 7 ['OS=="android"', { |
| 8 'targets': [ | 8 'targets': [ |
| 9 { | 9 { |
| 10 'target_name': 'cronet_jni_headers', | 10 'target_name': 'cronet_jni_headers', |
| (...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 778 '-Wno-sign-promo', | 778 '-Wno-sign-promo', |
| 779 '-Wno-missing-field-initializers', | 779 '-Wno-missing-field-initializers', |
| 780 ], | 780 ], |
| 781 'ldflags': [ | 781 'ldflags': [ |
| 782 '-llog', | 782 '-llog', |
| 783 '-Wl,--gc-sections', | 783 '-Wl,--gc-sections', |
| 784 '-Wl,--exclude-libs,ALL' | 784 '-Wl,--exclude-libs,ALL' |
| 785 ], | 785 ], |
| 786 }, | 786 }, |
| 787 { | 787 { |
| 788 'target_name': 'libcronet', | 788 'target_name': 'libcronet_shared', |
| 789 'type': 'shared_library', | 789 'type': 'shared_library', |
| 790 'sources': [ | 790 'sources': [ |
| 791 'cronet/ios/Cronet.h', | 791 'cronet/ios/Cronet.h', |
| 792 'cronet/ios/Cronet.mm', | 792 'cronet/ios/Cronet.mm', |
| 793 ], | 793 ], |
| 794 'dependencies': [ | 794 'dependencies': [ |
| 795 'cronet_static', | 795 'cronet_static', |
| 796 '../base/base.gyp:base', | 796 '../base/base.gyp:base', |
| 797 ], | 797 ], |
| 798 }, | 798 }, |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 872 # Build this target to package a standalone Cronet in a single | 872 # Build this target to package a standalone Cronet in a single |
| 873 # .a file. | 873 # .a file. |
| 874 'target_name': 'cronet_package', | 874 'target_name': 'cronet_package', |
| 875 'type': 'none', | 875 'type': 'none', |
| 876 'variables' : { | 876 'variables' : { |
| 877 'package_dir': '<(PRODUCT_DIR)/cronet', | 877 'package_dir': '<(PRODUCT_DIR)/cronet', |
| 878 }, | 878 }, |
| 879 'dependencies': [ | 879 'dependencies': [ |
| 880 # Depend on the dummy target so that all of CrNet's dependencies | 880 # Depend on the dummy target so that all of CrNet's dependencies |
| 881 # are built before packaging. | 881 # are built before packaging. |
| 882 'libcronet', | 882 'libcronet_shared', |
| 883 ], | 883 ], |
| 884 'actions': [ | 884 'actions': [ |
| 885 { | 885 { |
| 886 'action_name': 'Package Cronet', | 886 'action_name': 'Package Cronet', |
| 887 'variables': { | 887 'variables': { |
| 888 'tool_path': | 888 'tool_path': |
| 889 'cronet/tools/link_dependencies.py', | 889 'cronet/tools/link_dependencies.py', |
| 890 }, | 890 }, |
| 891 # Actions need an inputs list, even if it's empty. | 891 # Actions need an inputs list, even if it's empty. |
| 892 'inputs': [ | 892 'inputs': [ |
| 893 '<(tool_path)', | 893 '<(tool_path)', |
| 894 '<(PRODUCT_DIR)/libcronet.dylib', | 894 '<(PRODUCT_DIR)/libcronet_shared.dylib', |
| 895 ], | 895 ], |
| 896 # Only specify one output, since this will be libtool's output. | 896 # Only specify one output, since this will be libtool's output. |
| 897 'outputs': [ '<(package_dir)/libcronet_standalone_with_symbols.a
' ], | 897 'outputs': [ '<(package_dir)/libcronet_standalone_with_symbols.a
' ], |
| 898 'action': ['<(tool_path)', | 898 'action': ['<(tool_path)', |
| 899 '<(PRODUCT_DIR)', | 899 '<(PRODUCT_DIR)', |
| 900 'libcronet.dylib', | 900 'libcronet_shared.dylib', |
| 901 '<@(_outputs)', | 901 '<@(_outputs)', |
| 902 ], | 902 ], |
| 903 }, | 903 }, |
| 904 { | 904 { |
| 905 'action_name': 'Stripping standalone library', | 905 'action_name': 'Stripping standalone library', |
| 906 # Actions need an inputs list, even if it's empty. | 906 # Actions need an inputs list, even if it's empty. |
| 907 'inputs': [ | 907 'inputs': [ |
| 908 '<(package_dir)/libcronet_standalone_with_symbols.a', | 908 '<(package_dir)/libcronet_standalone_with_symbols.a', |
| 909 ], | 909 ], |
| 910 # Only specify one output, since this will be libtool's output. | 910 # Only specify one output, since this will be libtool's output. |
| (...skipping 21 matching lines...) Expand all Loading... |
| 932 'cronet/ios/test/cronet_bidirectional_stream_test.mm', | 932 'cronet/ios/test/cronet_bidirectional_stream_test.mm', |
| 933 'cronet/ios/test/cronet_test_runner.mm', | 933 'cronet/ios/test/cronet_test_runner.mm', |
| 934 ], | 934 ], |
| 935 }, | 935 }, |
| 936 ], | 936 ], |
| 937 }, | 937 }, |
| 938 ], | 938 ], |
| 939 }], # OS=="ios" | 939 }], # OS=="ios" |
| 940 ], | 940 ], |
| 941 } | 941 } |
| OLD | NEW |