From d2c7c08e7c212db7e9f7ce6b68d35a6e86094de4 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Mon, 24 Jan 2022 15:21:32 -0800 Subject: Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e --- tools/droiddoc/Android.bp | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'tools/droiddoc/Android.bp') diff --git a/tools/droiddoc/Android.bp b/tools/droiddoc/Android.bp index efd30c1849..71d49397f6 100644 --- a/tools/droiddoc/Android.bp +++ b/tools/droiddoc/Android.bp @@ -14,15 +14,22 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "build_make_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-BSD - // SPDX-license-identifier-CC-BY - // SPDX-license-identifier-GPL - // SPDX-license-identifier-MIT - default_applicable_licenses: ["build_make_license"], + default_applicable_licenses: [ + "Android-Apache-2.0", + "build_make_tools_droiddoc_license", + ], +} + +license { + name: "build_make_tools_droiddoc_license", + package_name: "Android Droiddoc Templates", + license_kinds: [ + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-CC-BY-2.5", + "SPDX-license-identifier-GPL-3.0", + "SPDX-license-identifier-MIT", + ], + license_text: ["LICENSE"], } droiddoc_exported_dir { -- cgit v1.2.3-59-g8ed1b