summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorpeter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 12:48:56 +0000
committerpeter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 12:48:56 +0000
commit18081a1f232d61b97cbf1145feb95c47098920c4 (patch)
tree54e4c23452a0009c6702e46f00e26666d36fd70e /DEPS
parentb022b46f75d386e3420c89adc7a945b06ea9bdc0 (diff)
downloadchromium_src-18081a1f232d61b97cbf1145feb95c47098920c4.zip
chromium_src-18081a1f232d61b97cbf1145feb95c47098920c4.tar.gz
chromium_src-18081a1f232d61b97cbf1145feb95c47098920c4.tar.bz2
Include Android-specific dependencies in the main DEPS file.
In order to be able to leverage versioning (in terms of Chromium rolls within WebKit) and improve general maintainability, Android will move towards deprecating the android.deps.git repository -which is a second gclient solution- in favor of using gclient's target_os=[] functionality. This allows our custom dependencies to be listed in the DEPS file as well. No one is using this setting yet, but WebKit Chromium-Android checkouts will be switched over shortly after this lands, which will be followed by the build bots and developers working on Chrome on Android. BUG=129577 TEST= Review URL: https://chromiumcodereview.appspot.com/10445018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS8
1 files changed, 8 insertions, 0 deletions
diff --git a/DEPS b/DEPS
index 051b13b..fd7bd70 100644
--- a/DEPS
+++ b/DEPS
@@ -444,6 +444,14 @@ deps_os = {
"src/third_party/gold":
"/trunk/deps/third_party/gold@124239",
},
+ "android": {
+ "src/third_party/freetype":
+ Var("chromium_git") + "/chromium/src/third_party/freetype.git" +
+ "@1f74e4e7ad3ca4163b4578fc30da26a165dd55e7",
+
+ "src/third_party/aosp":
+ "/trunk/deps/third_party/aosp@122156",
+ },
}