diff options
author | Elliott Hughes <enh@google.com> | 2024-04-12 22:06:44 +0000 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2024-04-12 22:06:44 +0000 |
commit | 0b015339810d006482de0478e44e48dcef27631b (patch) | |
tree | 08e373393d68501923a698ca740367cdc7d19381 | |
parent | 8de41113d0780f0de657a72df1e9aca267df0afa (diff) | |
download | vulkan-headers-main.tar.gz |
The headers are Apache-2, and there's one (unused) python script that's
MIT. Fix the .bp file to say that. Also remove the unused NOTICE
symlink.
Test: treehugger
Change-Id: Ia2827ab1f672044a82c03c967c58a4e09dd32558
-rw-r--r-- | Android.bp | 41 | ||||
l--------- | NOTICE | 1 |
2 files changed, 22 insertions, 20 deletions
@@ -12,38 +12,41 @@ // See the License for the specific language governing permissions and // limitations under the License. -// This module defines which headers are included in the NDK sysroot during -// the NDK build process. package { default_applicable_licenses: ["external_vulkan-headers_license"], } -// Added automatically by a large-scale-change that took the approach of -// 'apply every license found to every target'. While this makes sure we respect -// every license restriction, it may not be entirely correct. -// -// e.g. GPL in an MIT project might only apply to the contrib/ directory. -// -// Please consider splitting the single license below into multiple licenses, -// taking care not to lose any license_kind information, and overriding the -// default license using the 'licenses: [...]' property on targets as needed. -// -// For unused files, consider creating a 'fileGroup' with "//visibility:private" -// to attach the license to, and including a comment whether the files may be -// used in the current project. -// See: http://go/android-license-faq license { name: "external_vulkan-headers_license", visibility: [":__subpackages__"], license_kinds: [ "SPDX-license-identifier-Apache-2.0", - "SPDX-license-identifier-BSD", ], license_text: [ - "LICENSE.md", + "LICENSES/Apache-2.0.txt", + ], +} + +license { + name: "external_vulkan-headers_license.unused.MIT", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-MIT", + ], + license_text: [ + "LICENSES/MIT.txt", ], } +filegroup { + name: "external_vulkan-headers_unused.MIT", + visibility: ["//visibility:private"], + licenses: ["external_vulkan-headers_license.unused.MIT"], + srcs: ["registry/parse_dependency.py"], +} + +// This module defines which headers are included in the NDK sysroot during +// the NDK build process. ndk_headers { name: "ndk_vulkan_headers", from: "include", @@ -51,7 +54,7 @@ ndk_headers { srcs: [ "include/**/*.h", ], - license: "NOTICE", + license: "LICENSES/Apache-2.0.txt", } // This module makes Vulkan headers available to other modules without @@ -1 +0,0 @@ -LICENSE
\ No newline at end of file |