Use android_ndk cpu_features target

cpu_features GN target moved from android_sdk to android_ndk

TBR: minor rename of target
Bug: 990407
Change-Id: I82e25a24716d73e17f2e19dd5e83e94b636b8b0f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1756203
Auto-Submit: Sam Maier <smaier@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690799}

base/BUILD.gn

@@ -1453,7 +1453,7 @@ jumbo_component("base") {
 
     deps += [
       ":base_jni_headers",
-      "//third_party/android_sdk:cpu_features",
+      "//third_party/android_ndk:cpu_features",
       "//third_party/ashmem",
     ]
 

chrome/browser/BUILD.gn

@@ -2906,8 +2906,8 @@ jumbo_split_static_library("browser") {
       "//sandbox",
       "//sandbox:sandbox_buildflags",
       "//services/proxy_resolver:lib",
+      "//third_party/android_ndk:cpu_features",
       "//third_party/android_opengl/etc1",
-      "//third_party/android_sdk:cpu_features",
       "//third_party/crashpad/crashpad/client:client",
       "//third_party/libaddressinput:util",
       "//third_party/libphonenumber",

content/app/BUILD.gn

@@ -57,7 +57,7 @@ template("implement_content_app") {
       "//media/midi",
       "//net",
       "//skia",
-      "//third_party/android_sdk:cpu_features",
+      "//third_party/android_ndk:cpu_features",
       "//ui/android",
       "//ui/events",
       "//ui/shell_dialogs",

content/child/BUILD.gn

@@ -133,7 +133,7 @@ target(link_target_type, "child") {
   ]
 
   if (is_android) {
-    deps += [ "//third_party/android_sdk:cpu_features" ]
+    deps += [ "//third_party/android_ndk:cpu_features" ]
     if (notouch_build) {
       configs += [ ":notouch_config" ]
     }

content/renderer/BUILD.gn

@@ -573,7 +573,7 @@ target(link_target_type, "renderer") {
     set_sources_assignment_filter(sources_assignment_filter)
 
     deps += [
-      "//third_party/android_sdk:cpu_features",
+      "//third_party/android_ndk:cpu_features",
       "//third_party/libphonenumber",
     ]
   } else {

skia/BUILD.gn

@@ -486,7 +486,7 @@ component("skia") {
 
   if (is_android) {
     deps += [
-      "//third_party/android_sdk:cpu_features",
+      "//third_party/android_ndk:cpu_features",
       "//third_party/expat",
     ]
   }

third_party/android_sdk/BUILD.gn

@@ -4,29 +4,9 @@
 
 import("//build/config/android/rules.gni")
 
-config("cpu_features_include") {
-  include_dirs = [ "$android_ndk_root/sources/android/cpufeatures" ]
-}
-
-config("cpu_features_warnings") {
-  if (is_clang) {
-    # cpu-features.c has few unused functions on x86 b/26403333
-    cflags = [ "-Wno-unused-function" ]
-  }
-}
-
-source_set("cpu_features") {
-  sources = [
-    "$android_ndk_root/sources/android/cpufeatures/cpu-features.c",
-  ]
-  public_configs = [ ":cpu_features_include" ]
-
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    "//build/config/compiler:no_chromium_code",
-
-    # Must be after no_chromium_code for warning flags to be ordered correctly.
-    ":cpu_features_warnings",
+group("cpu_features") {
+  public_deps = [
+    "$android_ndk_root:cpu_features",
   ]
 }
 

third_party/libaom/BUILD.gn

@@ -205,7 +205,7 @@ if (enable_libaom_decoder) {
       deps += [ ":libaom_intrinsics_neon" ]
     }
     if (is_android) {
-      deps += [ "//third_party/android_sdk:cpu_features" ]
+      deps += [ "//third_party/android_ndk:cpu_features" ]
     }
     public_configs = [ ":libaom_external_config" ]
   }

third_party/libvpx/BUILD.gn

@@ -362,7 +362,7 @@ static_library("libvpx") {
     deps += [ ":libvpx_intrinsics_neon" ]
   }
   if (is_android) {
-    deps += [ "//third_party/android_sdk:cpu_features" ]
+    deps += [ "//third_party/android_ndk:cpu_features" ]
   }
   if (current_cpu == "arm" && arm_assembly_sources != []) {
     deps += [ ":libvpx_assembly_arm" ]

third_party/libwebp/BUILD.gn

@@ -180,7 +180,7 @@ static_library("libwebp_dsp") {
     ":libwebp_webp",
   ]
   if (is_android) {
-    deps += [ "//third_party/android_sdk:cpu_features" ]
+    deps += [ "//third_party/android_ndk:cpu_features" ]
   }
   if (current_cpu == "x86" || current_cpu == "x64") {
     defines = [

third_party/openh264/BUILD.gn

@@ -144,7 +144,7 @@ source_set("common") {
       # files replaces these using macros for "wels_..." versions of the same
       # functions. We do not have access to these and use the <cpu-features.h>
       # ones instead.
-      "//third_party/android_sdk:cpu_features",
+      "//third_party/android_ndk:cpu_features",
     ]
   }
 }

third_party/zlib/BUILD.gn

@@ -98,7 +98,7 @@ if (use_arm_neon_optimizations) {
         import("//build/config/android/config.gni")
         if (defined(android_ndk_root) && android_ndk_root != "") {
           deps = [
-            "//third_party/android_sdk:cpu_features",
+            "//third_party/android_ndk:cpu_features",
           ]
         } else {
           assert(false, "CPU detection requires the Android NDK")