summaryrefslogtreecommitdiffstats
path: root/android_webview/buildbot
diff options
context:
space:
mode:
authormkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-10 14:29:24 +0000
committermkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-10 14:29:24 +0000
commit48288e72574204bb2bb5558ce3dcbb303071f859 (patch)
treed13bdc47973b53d72467a509387c00ef266475d1 /android_webview/buildbot
parent195487fc27da171fc6a7420991d947033d33ebf0 (diff)
downloadchromium_src-48288e72574204bb2bb5558ce3dcbb303071f859.zip
chromium_src-48288e72574204bb2bb5558ce3dcbb303071f859.tar.gz
chromium_src-48288e72574204bb2bb5558ce3dcbb303071f859.tar.bz2
[android_webview] Add mesa to compile whitelist.
This adds the new mesa DEPS entry to the compile whitelist. This should fix the AOSP bot gyp error. BUG=None NOTRY=true Review URL: https://chromiumcodereview.appspot.com/15897012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/buildbot')
-rwxr-xr-xandroid_webview/buildbot/deps_whitelist.py20
1 files changed, 15 insertions, 5 deletions
diff --git a/android_webview/buildbot/deps_whitelist.py b/android_webview/buildbot/deps_whitelist.py
index 6439436..2bd6212 100755
--- a/android_webview/buildbot/deps_whitelist.py
+++ b/android_webview/buildbot/deps_whitelist.py
@@ -21,8 +21,17 @@ import sys
class DepsWhitelist(object):
def __init__(self):
- # Dependencies required to build android_webview.
- self._compile_dependencies = [
+ # If a new DEPS entry is needed for the AOSP bot to compile please add it
+ # here first.
+ # This is a staging area for deps that are accepted by the android_webview
+ # team and are in the process of having the required branches being created
+ # in the Android tree.
+ self._compile_but_not_snapshot_dependencies = [
+ 'third_party/mesa/src',
+ ]
+
+ # Dependencies that need to be merged into the Android tree.
+ self._snapshot_into_android_dependencies = [
'googleurl',
'sdch/open-vcdiff',
'testing/gtest',
@@ -50,8 +59,9 @@ class DepsWhitelist(object):
'v8',
]
- # Dependencies that need to be merged into the Android tree.
- self._snapshot_into_android_dependencies = self._compile_dependencies
+ # Dependencies required to build android_webview.
+ self._compile_dependencies = (self._snapshot_into_android_dependencies +
+ self._compile_but_not_snapshot_dependencies)
# Dependencies required to run android_webview tests but not required to
# compile.
@@ -147,7 +157,7 @@ class DepsWhitelist(object):
def get_deps_for_license_check(self, _):
"""Calculates the list of deps that need to be checked for Android license
compatibility"""
- return self._snapshot_into_android_dependencies
+ return self._compile_dependencies
def execute_method(self, method_name, deps_file_path):
methods = {