Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: content/shell/android/BUILD.gn

Issue 654383002: GN: Enable loading libraries from apks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@stack-debug
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 if (icu_use_data_file) { 92 if (icu_use_data_file) {
93 sources += [ 93 sources += [
94 "$root_build_dir/icudtl.dat" 94 "$root_build_dir/icudtl.dat"
95 ] 95 ]
96 } 96 }
97 } 97 }
98 98
99 android_apk("content_shell_apk") { 99 android_apk("content_shell_apk") {
100 use_chromium_linker = true 100 use_chromium_linker = true
101 load_library_from_apk = true
rmcilroy 2014/10/21 10:55:45 We don't do this for the content shell APK with gy
cjhopman 2014/10/21 17:28:53 We definitely should be doing this for some target
rmcilroy 2014/10/21 21:21:03 Agreed, I'll take a look at enabling the linker te
101 testonly = true 102 testonly = true
102 datadeps = [ 103 datadeps = [
103 # "//tools/android/forwarder", 104 # "//tools/android/forwarder",
104 ] 105 ]
105 deps = [ 106 deps = [
106 ":content_shell_apk_resources", 107 ":content_shell_apk_resources",
107 ":content_shell_java", 108 ":content_shell_java",
108 ":content_shell_apk_java", 109 ":content_shell_apk_java",
109 ":libcontent_shell_content_view", 110 ":libcontent_shell_content_view",
110 ":copy_content_shell_assets", 111 ":copy_content_shell_assets",
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 testonly = true 171 testonly = true
171 deps = [ 172 deps = [
172 ":content_shell_java", 173 ":content_shell_java",
173 ":copy_content_shell_assets", 174 ":copy_content_shell_assets",
174 ":linker_resources", 175 ":linker_resources",
175 ":linker_test", 176 ":linker_test",
176 "//base:base_java", 177 "//base:base_java",
177 "//content/public/android:content_java", 178 "//content/public/android:content_java",
178 "//ui/android:ui_java", 179 "//ui/android:ui_java",
179 ] 180 ]
181 load_library_from_apk = true
180 android_manifest = "linker_test_apk/AndroidManifest.xml" 182 android_manifest = "linker_test_apk/AndroidManifest.xml"
181 asset_location = content_shell_assets_dir 183 asset_location = content_shell_assets_dir
182 apk_name = "ChromiumLinkerTest" 184 apk_name = "ChromiumLinkerTest"
183 DEPRECATED_java_in_dir = "linker_test_apk/src" 185 DEPRECATED_java_in_dir = "linker_test_apk/src"
184 native_libs = [ 186 native_libs = [
185 "$root_build_dir/lib.stripped/liblinker_test.so" 187 "$root_build_dir/lib.stripped/liblinker_test.so"
186 ] 188 ]
187 use_chromium_linker = true 189 use_chromium_linker = true
188 enable_chromium_linker_tests = true 190 enable_chromium_linker_tests = true
189 } 191 }
(...skipping 18 matching lines...) Expand all
208 210
209 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers 211 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers
210 generate_jni("linker_test_jni_headers") { 212 generate_jni("linker_test_jni_headers") {
211 testonly = true 213 testonly = true
212 jni_package = "content/shell" 214 jni_package = "content/shell"
213 sources = [ 215 sources = [
214 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a", 216 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a",
215 ] 217 ]
216 } 218 }
217 } 219 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698