Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

base/android/linker/BUILD.gn

Index: base/android/linker/BUILD.gn
diff --git a/base/android/BUILD.gn b/base/android/linker/BUILD.gn
similarity index 65%
rename from base/android/BUILD.gn
rename to base/android/linker/BUILD.gn
index befe39795f2e97faec3764cddb7703581d13be9f..b26e3b041f6439adaae2a8fdb79ee6d1d90877a0 100644
--- a/base/android/BUILD.gn
+++ b/base/android/linker/BUILD.gn
@@ -1,10 +1,15 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
 import("//build/config/android/config.gni")
 
 assert(is_android)
 assert(!is_android_webview_build)
 
+# GYP: //base/base.gyp:chromium_android_linker
 shared_library("chromium_android_linker") {
-  sources = [ "linker/linker_jni.cc" ]
+  sources = [ "linker_jni.cc" ]
   # The NDK contains the crazy_linker here:
   #   '<(android_ndk_root)/crazy_linker.gyp:crazy_linker'
   # However, we use our own fork.  See bug 384700.