commit cb7c118a283e28f0de552a5adfe1a3dd2678eb24
author Lei Zhang <thestig@chromium.org> Thu Mar 21 17:48:18 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Mar 21 17:48:18 2019 +0000
tree 7b5f16f44295301d330c296442dbd6371fbe873e
parent 0e609bb98723fe8807fedea20b9b2b5e9c72e475

Stop using deps_os in the DEPS file.

Move entries to deps and gate them on conditions.

Chromium stopped using it, so follow along and avoid using a
potentially deprecated feature.

Change-Id: I6fd0ba8dade0d52ef93edc5f1835cdd68060fc3d
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/52096
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

DEPS

diff --git a/DEPS b/DEPS
index d3f96d8..a2ec0e3 100644
--- a/DEPS
+++ b/DEPS
@@ -51,10 +51,20 @@
   "testing/corpus":
     Var('pdfium_git') + "/pdfium_tests@" + Var('pdfium_tests_revision'),
 
+  "third_party/android_ndk": {
+    'url': Var('chromium_git') + "/android_ndk.git@" + Var('android_ndk_revision'),
+    'condition': 'checkout_android',
+  },
+
   "third_party/binutils":
     Var('chromium_git') + "/chromium/src/third_party/binutils.git@" +
         Var('binutils_revision'),
 
+  "third_party/catapult": {
+    'url': Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'),
+    'condition': 'checkout_android',
+  },
+
   'third_party/depot_tools':
     Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' +
         Var('depot_tools_revision'),
@@ -113,15 +123,6 @@
     Var('chromium_git') + "/v8/v8.git@" + Var('v8_revision'),
 }
 
-deps_os = {
-  "android": {
-    "third_party/android_ndk":
-      Var('chromium_git') + "/android_ndk.git@" + Var('android_ndk_revision'),
-    "third_party/catapult":
-      Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'),
-  },
-}
-
 recursedeps = [
   # buildtools provides clang_format, libc++, and libc++abi
   'buildtools',