| 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 import("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") |
| 6 import("//build/config/android/rules.gni") | 6 import("//build/config/android/rules.gni") |
| 7 import("//third_party/icu/config.gni") | 7 import("//third_party/icu/config.gni") |
| 8 | 8 |
| 9 generate_jni("content_shell_jni_headers") { | 9 generate_jni("content_shell_jni_headers") { |
| 10 jni_package = "content/shell" | 10 jni_package = "content/shell" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 "//content/shell:pak", | 25 "//content/shell:pak", |
| 26 "//components/crash/browser", | 26 "//components/crash/browser", |
| 27 "//skia", | 27 "//skia", |
| 28 "//media/base/android", | 28 "//media/base/android", |
| 29 ] | 29 ] |
| 30 sources = [ | 30 sources = [ |
| 31 "shell_library_loader.cc", | 31 "shell_library_loader.cc", |
| 32 "shell_library_loader.h", | 32 "shell_library_loader.h", |
| 33 ] | 33 ] |
| 34 if (is_android_webview_build) { | 34 if (is_android_webview_build) { |
| 35 ldflags = [ | 35 ldflags = [ "-lgabi++" ] |
| 36 "-lgabi++", | |
| 37 ] | |
| 38 } | 36 } |
| 39 } | 37 } |
| 40 | 38 |
| 41 android_resources("content_shell_java_resources") { | 39 android_resources("content_shell_java_resources") { |
| 42 testonly = true | 40 testonly = true |
| 43 resource_dirs = [ "java/res" ] | 41 resource_dirs = [ "java/res" ] |
| 44 custom_package = "org.chromium.content_shell" | 42 custom_package = "org.chromium.content_shell" |
| 45 } | 43 } |
| 46 | 44 |
| 47 android_library("content_shell_java") { | 45 android_library("content_shell_java") { |
| 48 testonly = true | 46 testonly = true |
| 49 deps = [ | 47 deps = [ |
| 50 "//base:base_java", | 48 "//base:base_java", |
| 51 "//content/public/android:content_java", | 49 "//content/public/android:content_java", |
| 52 "//media/base/android:media_java", | 50 "//media/base/android:media_java", |
| 53 "//mojo/public/java:system", | 51 "//mojo/public/java:system", |
| 54 "//net/android:net_java", | 52 "//net/android:net_java", |
| 55 "//ui/android:ui_java", | 53 "//ui/android:ui_java", |
| 56 ":content_shell_java_resources", | 54 ":content_shell_java_resources", |
| 57 ] | 55 ] |
| 58 DEPRECATED_java_in_dir = "java/src" | 56 DEPRECATED_java_in_dir = "java/src" |
| 59 } | 57 } |
| 60 | 58 |
| 61 android_resources("content_shell_apk_resources") { | 59 android_resources("content_shell_apk_resources") { |
| 62 testonly = true | 60 testonly = true |
| 63 resource_dirs = [ "shell_apk/res" ] | 61 resource_dirs = [ "shell_apk/res" ] |
| 64 deps = [ | 62 deps = [ |
| 65 ":content_shell_java_resources" | 63 ":content_shell_java_resources", |
| 66 ] | 64 ] |
| 67 android_manifest = "shell_apk/AndroidManifest.xml" | 65 android_manifest = "shell_apk/AndroidManifest.xml" |
| 68 } | 66 } |
| 69 | 67 |
| 70 android_library("content_shell_apk_java") { | 68 android_library("content_shell_apk_java") { |
| 71 testonly = true | 69 testonly = true |
| 72 deps = [ | 70 deps = [ |
| 73 ":content_shell_apk_resources", | 71 ":content_shell_apk_resources", |
| 74 ":content_shell_java", | 72 ":content_shell_java", |
| 75 "//base:base_java", | 73 "//base:base_java", |
| 76 "//content/public/android:content_java", | 74 "//content/public/android:content_java", |
| 77 "//media/base/android:media_java", | 75 "//media/base/android:media_java", |
| 78 "//net/android:net_java", | 76 "//net/android:net_java", |
| 79 "//ui/android:ui_java", | 77 "//ui/android:ui_java", |
| 80 ] | 78 ] |
| 81 DEPRECATED_java_in_dir = "shell_apk/src" | 79 DEPRECATED_java_in_dir = "shell_apk/src" |
| 82 } | 80 } |
| 83 | 81 |
| 84 content_shell_assets_dir = "$root_build_dir/content_shell/assets" | 82 content_shell_assets_dir = "$root_build_dir/content_shell/assets" |
| 85 copy_ex("copy_content_shell_assets") { | 83 copy_ex("copy_content_shell_assets") { |
| 86 clear_dir = true | 84 clear_dir = true |
| 87 dest = content_shell_assets_dir | 85 dest = content_shell_assets_dir |
| 88 sources = [ | 86 sources = [ |
| 89 "$root_out_dir/content_shell.pak" | 87 "$root_out_dir/content_shell.pak", |
| 90 ] | 88 ] |
| 91 | 89 |
| 92 if (icu_use_data_file) { | 90 if (icu_use_data_file) { |
| 93 sources += [ | 91 sources += [ "$root_build_dir/icudtl.dat" ] |
| 94 "$root_build_dir/icudtl.dat" | |
| 95 ] | |
| 96 } | 92 } |
| 97 } | 93 } |
| 98 | 94 |
| 99 android_apk("content_shell_apk") { | 95 android_apk("content_shell_apk") { |
| 100 use_chromium_linker = true | 96 use_chromium_linker = true |
| 101 testonly = true | 97 testonly = true |
| 102 datadeps = [ | 98 datadeps = [ |
| 103 # "//tools/android/forwarder", | 99 # "//tools/android/forwarder", |
| 104 ] | 100 ] |
| 105 deps = [ | 101 deps = [ |
| 106 ":content_shell_apk_resources", | 102 ":content_shell_apk_resources", |
| 107 ":content_shell_java", | 103 ":content_shell_java", |
| 108 ":content_shell_apk_java", | 104 ":content_shell_apk_java", |
| 109 ":libcontent_shell_content_view", | 105 ":libcontent_shell_content_view", |
| 110 ":copy_content_shell_assets", | 106 ":copy_content_shell_assets", |
| 111 "//base:base_java", | 107 "//base:base_java", |
| 112 "//content/public/android:content_java", | 108 "//content/public/android:content_java", |
| 113 "//media/base/android:media_java", | 109 "//media/base/android:media_java", |
| 114 "//net/android:net_java", | 110 "//net/android:net_java", |
| 111 |
| 115 #"//third_party/mesa:osmesa_in_lib_dir", | 112 #"//third_party/mesa:osmesa_in_lib_dir", |
| 116 "//ui/android:ui_java", | 113 "//ui/android:ui_java", |
| 117 ] | 114 ] |
| 118 apk_name = "ContentShell" | 115 apk_name = "ContentShell" |
| 119 android_manifest = "shell_apk/AndroidManifest.xml" | 116 android_manifest = "shell_apk/AndroidManifest.xml" |
| 120 native_libs = [ | 117 native_libs = [ "libcontent_shell_content_view.so" ] |
| 121 "libcontent_shell_content_view.so" | |
| 122 ] | |
| 123 asset_location = content_shell_assets_dir | 118 asset_location = content_shell_assets_dir |
| 124 | 119 |
| 125 # TODO(GYP) | 120 # TODO(GYP) |
| 126 #'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'], | 121 #'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'], |
| 127 | 122 |
| 128 if (is_android_webview_build) { | 123 if (is_android_webview_build) { |
| 129 # TODO(GYP) | 124 # TODO(GYP) |
| 130 } | 125 } |
| 131 } | 126 } |
| 132 | 127 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 152 "//net/android:net_javatests", | 147 "//net/android:net_javatests", |
| 153 ] | 148 ] |
| 154 datadeps = [ | 149 datadeps = [ |
| 155 ":content_shell_apk", | 150 ":content_shell_apk", |
| 156 ] | 151 ] |
| 157 apk_name = "ContentShellTest" | 152 apk_name = "ContentShellTest" |
| 158 android_manifest = "javatests/AndroidManifest.xml" | 153 android_manifest = "javatests/AndroidManifest.xml" |
| 159 } | 154 } |
| 160 | 155 |
| 161 if (cpu_arch != "x64" && cpu_arch != "arm64") { | 156 if (cpu_arch != "x64" && cpu_arch != "arm64") { |
| 162 | |
| 163 android_resources("linker_resources") { | 157 android_resources("linker_resources") { |
| 164 resource_dirs = [ "linker_test_apk/res" ] | 158 resource_dirs = [ "linker_test_apk/res" ] |
| 165 android_manifest = "linker_test_apk/AndroidManifest.xml" | 159 android_manifest = "linker_test_apk/AndroidManifest.xml" |
| 166 } | 160 } |
| 167 | 161 |
| 168 # GYP: //content/content_tests.gypi:chromium_linker_test_apk | 162 # GYP: //content/content_tests.gypi:chromium_linker_test_apk |
| 169 android_apk("chromium_linker_test_apk") { | 163 android_apk("chromium_linker_test_apk") { |
| 170 testonly = true | 164 testonly = true |
| 171 deps = [ | 165 deps = [ |
| 172 ":content_shell_java", | 166 ":content_shell_java", |
| 173 ":copy_content_shell_assets", | 167 ":copy_content_shell_assets", |
| 174 ":linker_resources", | 168 ":linker_resources", |
| 175 ":linker_test", | 169 ":linker_test", |
| 176 "//base:base_java", | 170 "//base:base_java", |
| 177 "//content/public/android:content_java", | 171 "//content/public/android:content_java", |
| 178 "//ui/android:ui_java", | 172 "//ui/android:ui_java", |
| 179 ] | 173 ] |
| 180 android_manifest = "linker_test_apk/AndroidManifest.xml" | 174 android_manifest = "linker_test_apk/AndroidManifest.xml" |
| 181 asset_location = content_shell_assets_dir | 175 asset_location = content_shell_assets_dir |
| 182 apk_name = "ChromiumLinkerTest" | 176 apk_name = "ChromiumLinkerTest" |
| 183 DEPRECATED_java_in_dir = "linker_test_apk/src" | 177 DEPRECATED_java_in_dir = "linker_test_apk/src" |
| 184 native_libs = [ | 178 native_libs = [ "liblinker_test.so" ] |
| 185 "liblinker_test.so" | |
| 186 ] | |
| 187 use_chromium_linker = true | 179 use_chromium_linker = true |
| 188 enable_chromium_linker_tests = true | 180 enable_chromium_linker_tests = true |
| 189 } | 181 } |
| 190 | 182 |
| 191 | |
| 192 # GYP: //content/content_tests.gypi:chromium_android_linker_test | 183 # GYP: //content/content_tests.gypi:chromium_android_linker_test |
| 193 shared_library("linker_test") { | 184 shared_library("linker_test") { |
| 194 testonly = true | 185 testonly = true |
| 195 sources = [ | 186 sources = [ |
| 196 "linker_test_apk/chromium_linker_test_android.cc", | 187 "linker_test_apk/chromium_linker_test_android.cc", |
| 197 "linker_test_apk/chromium_linker_test_linker_tests.cc", | 188 "linker_test_apk/chromium_linker_test_linker_tests.cc", |
| 198 ] | 189 ] |
| 199 | 190 |
| 200 deps = [ | 191 deps = [ |
| 201 ":linker_test_jni_headers", | 192 ":linker_test_jni_headers", |
| 202 "//content/shell:content_shell_lib", | 193 "//content/shell:content_shell_lib", |
| 194 |
| 203 # Required to include "content/public/browser/android/compositor.h" | 195 # Required to include "content/public/browser/android/compositor.h" |
| 204 # in chromium_linker_test_android.cc :-( | 196 # in chromium_linker_test_android.cc :-( |
| 205 "//skia", | 197 "//skia", |
| 206 ] | 198 ] |
| 207 } | 199 } |
| 208 | 200 |
| 209 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers | 201 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers |
| 210 generate_jni("linker_test_jni_headers") { | 202 generate_jni("linker_test_jni_headers") { |
| 211 testonly = true | 203 testonly = true |
| 212 jni_package = "content/shell" | 204 jni_package = "content/shell" |
| 213 sources = [ | 205 sources = [ |
| 214 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav
a", | 206 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav
a", |
| 215 ] | 207 ] |
| 216 } | 208 } |
| 217 } | 209 } |
| OLD | NEW |