Skip to content

Commit

Permalink
[android_webview] Add mesa to compile whitelist.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mkosiba@chromium.org committed Jun 10, 2013
1 parent 195487f commit 48288e7
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions android_webview/buildbot/deps_whitelist.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,17 @@

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',
Expand Down Expand Up @@ -50,8 +59,9 @@ def __init__(self):
'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.
Expand Down Expand Up @@ -147,7 +157,7 @@ def get_deps_for_android_merge(self, _):
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 = {
Expand Down

0 comments on commit 48288e7

Please sign in to comment.