summaryrefslogtreecommitdiffstats
path: root/third_party/khronos
diff options
context:
space:
mode:
authorsteveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-14 11:57:42 +0000
committersteveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-14 11:57:42 +0000
commit756b04e1e06ba31f280515049358d20720fa2ca9 (patch)
tree4d315de91f5f94e83e29c436275ab429cc412376 /third_party/khronos
parent47ac1123ed47690127044afdf3c5b38fd386ba6e (diff)
downloadchromium_src-756b04e1e06ba31f280515049358d20720fa2ca9.zip
chromium_src-756b04e1e06ba31f280515049358d20720fa2ca9.tar.gz
chromium_src-756b04e1e06ba31f280515049358d20720fa2ca9.tar.bz2
Add a function to provide the list of third-party directories which are incompatible with Android.
For most directories, we use a regex of whitelisted licenses to parse the 'License' field from the metadata. In some case, for example, where a custom license is used, we rely on a new 'Android Compatibility' field. This functionality will be used by the snapshot tool, which will exclude these incompatible directories from the snapshot in the Android tree. BUG=138921 Review URL: https://chromiumcodereview.appspot.com/10829272 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/khronos')
-rw-r--r--third_party/khronos/README.chromium5
1 files changed, 4 insertions, 1 deletions
diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium
index bbdba9c..837d13e 100644
--- a/third_party/khronos/README.chromium
+++ b/third_party/khronos/README.chromium
@@ -3,7 +3,7 @@ Short Name: khronos_headers
URL: http://www.khronos.org/registry
Version: unknown
Date: 2012-02-01
-License: MIT/X11 (BSD like) for {EGL,KHR}/*, SGI Free Software License B for GLES2/*
+License: MIT/X11, SGI Free Software License B
Security Critical: no
Description:
@@ -11,6 +11,9 @@ This package contains header files for the EGL and OpenGL ES 2.0 APIs from
Khronos. They are used for compiling code against these APIs as well as for
generating the GL binding initialization logic.
+MIT/X11 (BSD like) license is for {EGL,KHR}/*, SGI Free Software License B is
+for GLES2/*.
+
Local Modifications:
GLES2/gl2.h