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

Unified Diff: components/cronet/android/BUILD.gn

Issue 2060333002: [Cronet] Enforce ARMv7 Cronet doesn't inadvertently use ARM Neon instructions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: redo objdump path Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/cronet/tools/cr_cronet.py » ('j') | components/cronet/tools/enforce_no_neon.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/BUILD.gn
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index b8fffd5bb3db7b6120762b75c552531c6b60057c..38e0bfafd1bdca70ac775f0933577a7d17ad2e00 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -824,6 +824,25 @@ action("generate_javadoc") {
]
}
+action("enforce_no_neon") {
+ script = "//components/cronet/tools/enforce_no_neon.py"
+ args = [
+ rebase_path("${android_tool_prefix}objdump", root_build_dir),
+
+ # libcronet.so may contain ARM Neon instructions from BoringSSL, but these
+ # are only used after checking whether the CPU supports NEON at runtime,
+ # so instead check base/ as it represents a large swath of code that only
+ # contains Neon instructions when Neon is enabled by default.
+ rebase_path("$root_out_dir/obj/base/base/*.o", root_build_dir),
+ ]
+ outputs = [
+ "$root_out_dir/cronet_$target_name.d",
+ ]
+ deps = [
+ "//base:base",
+ ]
+}
+
copy("cronet_package_copy") {
sources = [
"$root_out_dir/lib.java/components/cronet/android/cronet_api.jar",
@@ -876,4 +895,7 @@ group("cronet_package") {
":jar_cronet_sample_source",
":repackage_extracted_jars",
]
+ if (current_cpu == "armv7" || current_cpu == "arm") {
+ deps += [ ":enforce_no_neon" ]
+ }
}
« no previous file with comments | « no previous file | components/cronet/tools/cr_cronet.py » ('j') | components/cronet/tools/enforce_no_neon.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698