Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bef51ae authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge "Add licenses to ndk_headers." 

am: 8c9cd8a2

Change-Id: I6a49ab856d6f52597067be0df5e34b9459efdb33
parents 10155def 8c9cd8a2

Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -3,6 +3,7 @@ ndk_headers { 
    from: "include/android",

    from: "include/android",

    to: "android",

    to: "android",

    srcs: ["include/android/**/*.h"],

    srcs: ["include/android/**/*.h"],

    license: "NOTICE",

}

}





subdirs = [

subdirs = [

opengl/Android.bp

+5 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ ndk_headers { 
    from: "include",

    from: "include",

    to: "",

    to: "",

    srcs: ["include/EGL/**/*.h"],

    srcs: ["include/EGL/**/*.h"],

    license: "include/EGL/NOTICE",

}

}





ndk_headers {

ndk_headers {
@@ -24,6 +25,7 @@ ndk_headers { 
    from: "include",

    from: "include",

    to: "",

    to: "",

    srcs: ["include/GLES/**/*.h"],

    srcs: ["include/GLES/**/*.h"],

    license: "include/GLES/NOTICE",

}

}





ndk_headers {

ndk_headers {
@@ -31,6 +33,7 @@ ndk_headers { 
    from: "include",

    from: "include",

    to: "",

    to: "",

    srcs: ["include/GLES2/**/*.h"],

    srcs: ["include/GLES2/**/*.h"],

    license: "include/GLES2/NOTICE",

}

}





ndk_headers {

ndk_headers {
@@ -38,6 +41,7 @@ ndk_headers { 
    from: "include",

    from: "include",

    to: "",

    to: "",

    srcs: ["include/GLES3/**/*.h"],

    srcs: ["include/GLES3/**/*.h"],

    license: "include/GLES3/NOTICE",

}

}





ndk_headers {

ndk_headers {
@@ -45,6 +49,7 @@ ndk_headers { 
    from: "include",

    from: "include",

    to: "",

    to: "",

    srcs: ["include/KHR/**/*.h"],

    srcs: ["include/KHR/**/*.h"],

    license: "include/KHR/NOTICE",

}

}





subdirs = [

subdirs = [

opengl/include/EGL/NOTICE

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
Copyright (c) 2007-2009 The Khronos Group Inc.



Permission is hereby granted, free of charge, to any person obtaining a

copy of this software and/or associated documentation files (the

"Materials"), to deal in the Materials without restriction, including

without limitation the rights to use, copy, modify, merge, publish,

distribute, sublicense, and/or sell copies of the Materials, and to

permit persons to whom the Materials are furnished to do so, subject to

the following conditions:



The above copyright notice and this permission notice shall be included

in all copies or substantial portions of the Materials.



THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.

opengl/include/GLES/NOTICE

0 → 100644
+2 −0
Original line number Original line Diff line number Diff line 
This document is licensed under the SGI Free Software B License Version 2.0.

For details, see http://oss.sgi.com/projects/FreeB/ .

opengl/include/GLES2/NOTICE

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
Copyright (c) 2013-2015 The Khronos Group Inc.



Permission is hereby granted, free of charge, to any person obtaining a

copy of this software and/or associated documentation files (the

"Materials"), to deal in the Materials without restriction, including

without limitation the rights to use, copy, modify, merge, publish,

distribute, sublicense, and/or sell copies of the Materials, and to

permit persons to whom the Materials are furnished to do so, subject to

the following conditions:



The above copyright notice and this permission notice shall be included

in all copies or substantial portions of the Materials.



THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.