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

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

Issue 721123002: GN: Have android_apk always look for stripped libraries. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Follow review Created 6 years, 1 month 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
« no previous file with comments | « chrome/android/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 "//base:base_java", 111 "//base:base_java",
112 "//content/public/android:content_java", 112 "//content/public/android:content_java",
113 "//media/base/android:media_java", 113 "//media/base/android:media_java",
114 "//net/android:net_java", 114 "//net/android:net_java",
115 #"//third_party/mesa:osmesa_in_lib_dir", 115 #"//third_party/mesa:osmesa_in_lib_dir",
116 "//ui/android:ui_java", 116 "//ui/android:ui_java",
117 ] 117 ]
118 apk_name = "ContentShell" 118 apk_name = "ContentShell"
119 android_manifest = "shell_apk/AndroidManifest.xml" 119 android_manifest = "shell_apk/AndroidManifest.xml"
120 native_libs = [ 120 native_libs = [
121 "$root_build_dir/lib.stripped/libcontent_shell_content_view.so" 121 "libcontent_shell_content_view.so"
122 ] 122 ]
123 asset_location = content_shell_assets_dir 123 asset_location = content_shell_assets_dir
124 124
125 # TODO(GYP) 125 # TODO(GYP)
126 #'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'], 126 #'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'],
127 127
128 if (is_android_webview_build) { 128 if (is_android_webview_build) {
129 # TODO(GYP) 129 # TODO(GYP)
130 } 130 }
131 } 131 }
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 ":linker_test", 175 ":linker_test",
176 "//base:base_java", 176 "//base:base_java",
177 "//content/public/android:content_java", 177 "//content/public/android:content_java",
178 "//ui/android:ui_java", 178 "//ui/android:ui_java",
179 ] 179 ]
180 android_manifest = "linker_test_apk/AndroidManifest.xml" 180 android_manifest = "linker_test_apk/AndroidManifest.xml"
181 asset_location = content_shell_assets_dir 181 asset_location = content_shell_assets_dir
182 apk_name = "ChromiumLinkerTest" 182 apk_name = "ChromiumLinkerTest"
183 DEPRECATED_java_in_dir = "linker_test_apk/src" 183 DEPRECATED_java_in_dir = "linker_test_apk/src"
184 native_libs = [ 184 native_libs = [
185 "$root_build_dir/lib.stripped/liblinker_test.so" 185 "liblinker_test.so"
186 ] 186 ]
187 use_chromium_linker = true 187 use_chromium_linker = true
188 enable_chromium_linker_tests = true 188 enable_chromium_linker_tests = true
189 } 189 }
190 190
191 191
192 # GYP: //content/content_tests.gypi:chromium_android_linker_test 192 # GYP: //content/content_tests.gypi:chromium_android_linker_test
193 shared_library("linker_test") { 193 shared_library("linker_test") {
194 testonly = true 194 testonly = true
195 sources = [ 195 sources = [
(...skipping 12 matching lines...) Expand all
208 208
209 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers 209 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers
210 generate_jni("linker_test_jni_headers") { 210 generate_jni("linker_test_jni_headers") {
211 testonly = true 211 testonly = true
212 jni_package = "content/shell" 212 jni_package = "content/shell"
213 sources = [ 213 sources = [
214 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a", 214 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a",
215 ] 215 ]
216 } 216 }
217 } 217 }
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698