[ndk] Change ndk deps in src and relocate to third_party/android_ndk

Because the android sdk managed by CIPD (see go/use-adjective-apis),
its deps repo ndk needs to be relocated, as well as hooked by the root
DEPS instead of recursedeps. This CL addes android ndk deps in
src/DEPS.

Also update recipes/configs with the ndk location in Chromium.

Bug: 755920
Change-Id: If28b9d7e58a91d0814d36eabd5de661a34f7a7cc
Reviewed-on: https://chromium-review.googlesource.com/853294Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: Shenghua Zhang <shenghuazhang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#528501}

DEPS

@@ -263,6 +263,11 @@ deps = {
       'condition': 'checkout_android',
   },
 
+  'src/third_party/android_ndk': {
+      'url': Var('chromium_git') + '/android_ndk.git' + '@' + 'e951c37287c7d8cd915bf8d4149fd4a06d808b55',
+      'condition': 'checkout_android',
+  },
+
   'src/third_party/android_tools': {
       'url': Var('chromium_git') + '/android_tools.git' + '@' + 'c78b25872734e0038ae2a333edc645cd96bc232d',
       'condition': 'checkout_android',

base/android/android_hardware_buffer_abi.h

@@ -11,7 +11,7 @@
 // wrapper for building without NDK platform level support, it is not a
 // general-use header and is not complete.
 //
-// TODO(crbug.com/771171): Delete this file when third_party/android_tools/ndk/
+// TODO(crbug.com/771171): Delete this file when third_party/android_ndk/
 // is updated to a version that contains the android/hardware_buffer.h file.
 //
 // Please refer to the API documentation for details:

base/android/linker/android_dlext.h

@@ -13,7 +13,7 @@
 // not complain about a missing symbol when loading our library.
 //
 // Details below taken from:
-//   third_party/android_tools/ndk/platforms/android-21
+//   third_party/android_ndk/platforms/android-21
 //       /arch-arm/usr/include/android/dlext.h
 //
 // Although taken specifically from arch-arm, there are no architecture-

build/android/pylib/constants/__init__.py

@@ -102,7 +102,7 @@ ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
                                  'build-tools', ANDROID_SDK_BUILD_TOOLS_VERSION)
 ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
-                                'third_party', 'android_tools', 'ndk')
+                                'third_party', 'android_ndk')
 
 PROGUARD_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party', 'proguard')
 

build/android/tests/symbolize/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-TOOLCHAIN=../../../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/arm-linux-androideabi-
+TOOLCHAIN=../../../../third_party/android_ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/arm-linux-androideabi-
 CXX=$(TOOLCHAIN)g++
 
 lib%.so: %.cc

build/config/android/BUILD.gn

@@ -182,7 +182,7 @@ config("runtime_library") {
     # 64-bit targets build with NDK 21, 32-bit targets with NDK 16
     # (see ./config.gni).  When using clang, NDK 21 defines snprintf to
     # something for a kind of for of _FORTIFY_SOURCE support, see
-    # third_party/android_tools/ndk/platforms/android-21/arch-x86_64/usr/include/stdio.h
+    # third_party/android_ndk/platforms/android-21/arch-x86_64/usr/include/stdio.h
     # Making snprintf a macro breaks base/strings/string_utils.h which
     # defines base::snprintf().  So define snprintf to itself to force the
     # NDK to not redefine it.  This disables _chk for snprintf, but since

build/config/android/config.gni

@@ -53,7 +53,7 @@ if (is_android) {
   }
 
   if (!defined(default_android_ndk_root)) {
-    default_android_ndk_root = "//third_party/android_tools/ndk"
+    default_android_ndk_root = "//third_party/android_ndk"
     default_android_ndk_version = "r16"
     default_android_ndk_major_version = 16
   } else {

build_overrides/build.gni

@@ -8,7 +8,7 @@ build_with_chromium = true
 
 # Uncomment these to specify a different NDK location and version in
 # non-Chromium builds.
-# default_android_ndk_root = "//third_party/android_tools/ndk"
+# default_android_ndk_root = "//third_party/android_ndk"
 # default_android_ndk_version = "r10e"
 
 # Some non-Chromium builds don't support building java targets.

tools/binary_size/libsupersize/testdata/test.map

@@ -162,8 +162,8 @@ Memory map
  .init_array    0x02ddc60c        0x4 obj/base/base/page_allocator.o
 
 .fini_array     0x02ddc6f4        0x8
- .fini_array    0x02ddc6f4        0x4 ../../third_party/android_tools/ndk/platforms/android-16/arch-arm/usr/lib/crtbegin_so.o
- .fini_array    0x02ddc6f8        0x4 ../../third_party/android_tools/ndk/platforms/android-16/arch-arm/usr/lib/crtend_so.o
+ .fini_array    0x02ddc6f4        0x4 ../../third_party/android_ndk/platforms/android-16/arch-arm/usr/lib/crtbegin_so.o
+ .fini_array    0x02ddc6f8        0x4 ../../third_party/android_ndk/platforms/android-16/arch-arm/usr/lib/crtend_so.o
 
 .dynamic        0x02ddc6fc      0x130
  ** dynamic     0x02ddc6fc      0x130

tools/clang/scripts/update.py

@@ -70,7 +70,7 @@ STAMP_FILE = os.path.normpath(
     os.path.join(LLVM_DIR, '..', 'llvm-build', 'cr_build_revision'))
 VERSION = '6.0.0'
 ANDROID_NDK_DIR = os.path.join(
-    CHROMIUM_DIR, 'third_party', 'android_tools', 'ndk')
+    CHROMIUM_DIR, 'third_party', 'android_ndk')
 
 # URL for pre-built binaries.
 CDS_URL = os.environ.get('CDS_CLANG_BUCKET_OVERRIDE',