| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'target_defaults': { | 6 'target_defaults': { |
| 7 'conditions': [ | 7 'conditions': [ |
| 8 ['mojo_shell_debug_url != ""', { | 8 ['mojo_shell_debug_url != ""', { |
| 9 'defines': [ | 9 'defines': [ |
| 10 'MOJO_SHELL_DEBUG=1', | 10 'MOJO_SHELL_DEBUG=1', |
| (...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 905 '../base/base.gyp:base_java', | 905 '../base/base.gyp:base_java', |
| 906 '../net/net.gyp:net_java', | 906 '../net/net.gyp:net_java', |
| 907 'mojo_native_viewport_java', | 907 'mojo_native_viewport_java', |
| 908 'libmojo_shell', | 908 'libmojo_shell', |
| 909 ], | 909 ], |
| 910 'variables': { | 910 'variables': { |
| 911 'apk_name': 'MojoShell', | 911 'apk_name': 'MojoShell', |
| 912 'java_in_dir': '<(DEPTH)/mojo/shell/android/apk', | 912 'java_in_dir': '<(DEPTH)/mojo/shell/android/apk', |
| 913 'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res', | 913 'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res', |
| 914 'native_lib_target': 'libmojo_shell', | 914 'native_lib_target': 'libmojo_shell', |
| 915 'additional_bundled_libs': [ |
| 916 '<(PRODUCT_DIR)/libmojo_network_service.so', |
| 917 ], |
| 915 }, | 918 }, |
| 916 'includes': [ '../build/java_apk.gypi' ], | 919 'includes': [ '../build/java_apk.gypi' ], |
| 917 } | 920 } |
| 918 ], | 921 ], |
| 919 }], | 922 }], |
| 920 ['OS=="linux"', { | 923 ['OS=="linux"', { |
| 921 'targets': [ | 924 'targets': [ |
| 922 { | 925 { |
| 923 'target_name': 'mojo_dbus_service', | 926 'target_name': 'mojo_dbus_service', |
| 924 'type': 'static_library', | 927 'type': 'static_library', |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1030 'views/views_init_internal.h', | 1033 'views/views_init_internal.h', |
| 1031 ], | 1034 ], |
| 1032 'defines': [ | 1035 'defines': [ |
| 1033 'MOJO_VIEWS_IMPLEMENTATION', | 1036 'MOJO_VIEWS_IMPLEMENTATION', |
| 1034 ], | 1037 ], |
| 1035 }, | 1038 }, |
| 1036 ], | 1039 ], |
| 1037 }], | 1040 }], |
| 1038 ], | 1041 ], |
| 1039 } | 1042 } |
| OLD | NEW |