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

Side by Side Diff: components/cronet/android/BUILD.gn

Issue 2684123002: Revert of Android: Use linker script to hide all non-JNI symbols (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « chrome/android/BUILD.gn ('k') | components/cronet/android/only_jni_exports.lst » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/android/rules.gni") 7 import("//build/config/android/rules.gni")
8 import("//build/util/process_version.gni") 8 import("//build/util/process_version.gni")
9 import("//build/util/version.gni") 9 import("//build/util/version.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 257
258 shared_library("cronet") { 258 shared_library("cronet") {
259 sources = [ 259 sources = [
260 "cronet_jni.cc", 260 "cronet_jni.cc",
261 ] 261 ]
262 deps = [ 262 deps = [
263 ":cronet_static", 263 ":cronet_static",
264 "//base", 264 "//base",
265 "//net:net", 265 "//net:net",
266 ] 266 ]
267 ldflags = [ "-Wl,--version-script=" +
268 rebase_path("//components/cronet/android/only_jni_exports.lst") ]
269
270 # Avoid hide_native_jni_exports as it adds another version script, and the
271 # ARM64 linker throws an error for multiple version scripts with anonymous
272 # version tags.
273 configs -= [ "//build/config/android:hide_native_jni_exports" ]
267 } 274 }
268 275
269 cronet_api_srcjar_deps = [ ":cronet_api_version_srcjar" ] 276 cronet_api_srcjar_deps = [ ":cronet_api_version_srcjar" ]
270 277
271 # cronet_api_java.jar defines Cronet API. 278 # cronet_api_java.jar defines Cronet API.
272 android_library("cronet_api_java") { 279 android_library("cronet_api_java") {
273 output_name = "cronet_api" 280 output_name = "cronet_api"
274 java_files = [ 281 java_files = [
275 "api/src/org/chromium/net/BidirectionalStream.java", 282 "api/src/org/chromium/net/BidirectionalStream.java",
276 "api/src/org/chromium/net/CronetEngine.java", 283 "api/src/org/chromium/net/CronetEngine.java",
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 "//base/test:test_support", 545 "//base/test:test_support",
539 "//components/prefs", 546 "//components/prefs",
540 "//net", 547 "//net",
541 "//net:simple_quic_tools", 548 "//net:simple_quic_tools",
542 "//net:test_support", 549 "//net:test_support",
543 "//third_party/icu", 550 "//third_party/icu",
544 ] 551 ]
545 552
546 include_dirs = [ _cronet_version_header_include_dir ] 553 include_dirs = [ _cronet_version_header_include_dir ]
547 554
555 ldflags = [ "-Wl,--version-script=" +
556 rebase_path("//components/cronet/android/only_jni_exports.lst") ]
557
558 # Avoid hide_native_jni_exports as it adds another version script, and the
559 # ARM64 linker throws an error for multiple version scripts with anonymous
560 # version tags.
561 configs -= [ "//build/config/android:hide_native_jni_exports" ]
562
548 if (cronet_enable_data_reduction_proxy_support) { 563 if (cronet_enable_data_reduction_proxy_support) {
549 deps += [ "//components/data_reduction_proxy/core/browser:browser_small" ] 564 deps += [ "//components/data_reduction_proxy/core/browser:browser_small" ]
550 } 565 }
551 } 566 }
552 567
553 android_resources("cronet_test_apk_resources") { 568 android_resources("cronet_test_apk_resources") {
554 testonly = true 569 testonly = true
555 resource_dirs = [ 570 resource_dirs = [
556 "test/res", 571 "test/res",
557 "test/smoketests/res/native", 572 "test/smoketests/res/native",
(...skipping 924 matching lines...) Expand 10 before | Expand all | Expand 10 after
1482 deps = [ 1497 deps = [
1483 ":cronet_package_copy_native_test_lib", 1498 ":cronet_package_copy_native_test_lib",
1484 ":cronet_package_copy_native_test_lib_unstripped", 1499 ":cronet_package_copy_native_test_lib_unstripped",
1485 ":cronet_package_copy_test_assets", 1500 ":cronet_package_copy_test_assets",
1486 ":cronet_package_copy_test_files", 1501 ":cronet_package_copy_test_files",
1487 ":cronet_package_copy_test_support_apks", 1502 ":cronet_package_copy_test_support_apks",
1488 ":repackage_extracted_test_jars", 1503 ":repackage_extracted_test_jars",
1489 ] 1504 ]
1490 } 1505 }
1491 } 1506 }
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | components/cronet/android/only_jni_exports.lst » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698