commit 0e7622c14d7542fc722d0a66e2af5abc8a1d462a
author Lei Zhang <thestig@chromium.org> Mon Apr 01 23:10:02 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Apr 01 23:10:02 2019 +0000
tree 1f60427cd033d41586625a9813cd0e2b40bb79a6
parent 89049907f243bf69d6f69fe3acdd0ac4f6ec8160

Remove build/secondary usage on Android.

1) Roll build/ 38cbca57e..a525b65ef (1 commit)

https://chromium.googlesource.com/chromium/src/build.git/+log/38cbca57e47c..a525b65ef9bb

2) Check in a minimal copy of third_party/android_sdk/BUILD.gn from
   Chromium.

BUG=chromium:947060

Change-Id: I7a01a13823ad40c4c2c9475bf7da56251977f763
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/52665
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>

DEPS

diff --git a/DEPS b/DEPS
index e75aa8a..aa6a434 100644
--- a/DEPS
+++ b/DEPS
@@ -14,7 +14,7 @@
 
   'android_ndk_revision': '4e2cea441bfd43f0863d14f57b1e1844260b9884',
   'binutils_revision': '2be73f7fbf783d7a0b288e174a5773b67c7656bc',
-  'build_revision': '38cbca57e47c72cd0d8db4356bf703d86aa17c87',
+  'build_revision': 'a525b65ef9bb356deb0d45bdeda56b9faf09d544',
   'buildtools_revision': '62f9eb0d64d6bf48f620b8233d9f7a1dc07f8414',
   'catapult_revision': 'ec795debc5c195658e95f5e750f6c0895c8171f2',
   'clang_revision': 'adc6ac450cea4f39ec778437696afbcd163d2a93',

third_party/android_sdk/BUILD.gn

diff --git a/third_party/android_sdk/BUILD.gn b/third_party/android_sdk/BUILD.gn
new file mode 100644
index 0000000..852b66a
--- /dev/null
+++ b/third_party/android_sdk/BUILD.gn
@@ -0,0 +1,31 @@
+# Copyright 2019 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/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",
+  ]
+}