Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'targets': [ | 5 'targets': [ |
| 6 { | 6 { |
| 7 'target_name': 'android_webview_apk', | 7 'target_name': 'android_webview_apk', |
| 8 'type': 'none', | 8 'type': 'none', |
| 9 'dependencies': [ | 9 'dependencies': [ |
| 10 'libstandalonelibwebviewchromium', | 10 'libstandalonelibwebviewchromium', |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 26 '<(PRODUCT_DIR)/android_webview_apk/assets/cookie_test.html', | 26 '<(PRODUCT_DIR)/android_webview_apk/assets/cookie_test.html', |
| 27 '<(PRODUCT_DIR)/android_webview_apk/assets/asset_icon.png', | 27 '<(PRODUCT_DIR)/android_webview_apk/assets/asset_icon.png', |
| 28 '<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video_test.html ', | 28 '<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video_test.html ', |
| 29 ], | 29 ], |
| 30 'conditions': [ | 30 'conditions': [ |
| 31 ['icu_use_data_file_flag==1', { | 31 ['icu_use_data_file_flag==1', { |
| 32 'additional_input_paths': [ | 32 'additional_input_paths': [ |
| 33 '<(PRODUCT_DIR)/icudtl.dat', | 33 '<(PRODUCT_DIR)/icudtl.dat', |
| 34 ], | 34 ], |
| 35 }], | 35 }], |
| 36 ['v8_use_external_startup_data==1', { | |
| 37 'additional_input_paths': [ | |
| 38 '<(PRODUCT_DIR)/natives_blob.bin', | |
| 39 '<(PRODUCT_DIR)/snapshot_blob.bin', | |
| 40 ], | |
| 41 }], | |
| 36 ], | 42 ], |
| 37 }, | 43 }, |
| 38 'copies': [ | 44 'copies': [ |
| 39 { | 45 { |
| 40 'destination': '<(PRODUCT_DIR)/android_webview_apk/assets', | 46 'destination': '<(PRODUCT_DIR)/android_webview_apk/assets', |
| 41 'files': [ | 47 'files': [ |
| 42 '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak', | 48 '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak', |
| 43 '<(PRODUCT_DIR)/android_webview_assets/en-US.pak', | 49 '<(PRODUCT_DIR)/android_webview_assets/en-US.pak', |
| 44 '<(java_in_dir)/assets/asset_file.html', | 50 '<(java_in_dir)/assets/asset_file.html', |
| 45 '<(java_in_dir)/assets/asset_icon.png', | 51 '<(java_in_dir)/assets/asset_icon.png', |
| 46 '<(java_in_dir)/assets/cookie_test.html', | 52 '<(java_in_dir)/assets/cookie_test.html', |
| 47 '<(java_in_dir)/assets/full_screen_video_test.html', | 53 '<(java_in_dir)/assets/full_screen_video_test.html', |
| 48 ], | 54 ], |
| 49 'conditions': [ | 55 'conditions': [ |
| 50 ['icu_use_data_file_flag==1', { | 56 ['icu_use_data_file_flag==1', { |
| 51 'files': [ | 57 'files': [ |
| 52 '<(PRODUCT_DIR)/icudtl.dat', | 58 '<(PRODUCT_DIR)/icudtl.dat', |
| 53 ], | 59 ], |
| 54 » }], | 60 » }], |
|
rmcilroy
2014/10/06 15:41:02
replace tabs with spaces (throughout)
baixo
2014/10/07 14:53:27
Done.
| |
| 61 ['v8_use_external_startup_data==1', { | |
| 62 'files': [ | |
| 63 '<(PRODUCT_DIR)/natives_blob.bin', | |
| 64 '<(PRODUCT_DIR)/snapshot_blob.bin', | |
| 65 ], | |
| 66 » }], | |
| 55 ], | 67 ], |
| 56 }, | 68 }, |
| 57 ], | 69 ], |
| 58 'includes': [ '../build/java_apk.gypi' ], | 70 'includes': [ '../build/java_apk.gypi' ], |
| 59 }, | 71 }, |
| 60 { | 72 { |
| 61 # android_webview_apk creates a .jar as a side effect. Any java | 73 # android_webview_apk creates a .jar as a side effect. Any java |
| 62 # targets that need that .jar in their classpath should depend on this | 74 # targets that need that .jar in their classpath should depend on this |
| 63 # target. For more details see the chrome_shell_apk_java target. | 75 # target. For more details see the chrome_shell_apk_java target. |
| 64 'target_name': 'android_webview_apk_java', | 76 'target_name': 'android_webview_apk_java', |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 83 'is_test_apk': 1, | 95 'is_test_apk': 1, |
| 84 }, | 96 }, |
| 85 'includes': [ '../build/java_apk.gypi' ], | 97 'includes': [ '../build/java_apk.gypi' ], |
| 86 }, | 98 }, |
| 87 { | 99 { |
| 88 'target_name': 'android_webview_unittests', | 100 'target_name': 'android_webview_unittests', |
| 89 'type': '<(gtest_target_type)', | 101 'type': '<(gtest_target_type)', |
| 90 'dependencies': [ | 102 'dependencies': [ |
| 91 '../base/base.gyp:test_support_base', | 103 '../base/base.gyp:test_support_base', |
| 92 '../content/content_shell_and_tests.gyp:test_support_content', | 104 '../content/content_shell_and_tests.gyp:test_support_content', |
| 105 '../gin/gin.gyp:gin', | |
|
rmcilroy
2014/10/06 15:41:02
I think we can remove this gin dependency from her
baixo
2014/10/07 14:53:27
Done.
| |
| 93 '../net/net.gyp:net_test_support', | 106 '../net/net.gyp:net_test_support', |
| 94 '../testing/android/native_test.gyp:native_test_native_code', | 107 '../testing/android/native_test.gyp:native_test_native_code', |
| 95 '../testing/gmock.gyp:gmock', | 108 '../testing/gmock.gyp:gmock', |
| 96 '../testing/gtest.gyp:gtest', | 109 '../testing/gtest.gyp:gtest', |
| 97 '../ui/base/ui_base.gyp:ui_base_jni_headers', | 110 '../ui/base/ui_base.gyp:ui_base_jni_headers', |
| 98 'android_webview_common', | 111 'android_webview_common', |
| 99 'android_webview_unittests_jni', | 112 'android_webview_unittests_jni', |
| 100 ], | 113 ], |
| 101 'include_dirs': [ | 114 'include_dirs': [ |
| 102 '..', | 115 '..', |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 179 ], | 192 ], |
| 180 }, | 193 }, |
| 181 { | 194 { |
| 182 'target_name': 'libstandalonelibwebviewchromium', | 195 'target_name': 'libstandalonelibwebviewchromium', |
| 183 'includes': [ | 196 'includes': [ |
| 184 'libwebviewchromium.gypi', | 197 'libwebviewchromium.gypi', |
| 185 ], | 198 ], |
| 186 }, | 199 }, |
| 187 ], | 200 ], |
| 188 } | 201 } |
| OLD | NEW |