Fix license text -- switch to Android-Apache-2.0 am: 4bc189377d am: 84af7ecf6a (d3c2cd6b) · Commits · e / os / android_packages_apps_DocumentsUI

Android.bp

+15 −18

Original line number	Diff line number	Diff line
		@@ -13,31 +13,18 @@
		// limitations under the License.

		package {
		default_applicable_licenses: ["packages_apps_DocumentsUI_license"],
		default_applicable_licenses: ["Android-Apache-2.0"],
		}

		// 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: "packages_apps_DocumentsUI_license",
		visibility: [":__subpackages__"],
		// res/drawable contains at least 1 Public Domain file
		name: "packages_apps_DocumentsUI_res_drawable_pd_license",
		visibility: ["//visibility:private"],
		license_kinds: [
		"SPDX-license-identifier-Apache-2.0",
		"legacy_unencumbered",
		],
		// large-scale-change unable to identify any license_text files
		license_text: [],
		}

		java_defaults {
		@@ -142,6 +129,11 @@ android_library {
		"res",
		],

		licenses: [
		"Android-Apache-2.0",
		"packages_apps_DocumentsUI_res_drawable_pd_license",
		],

		aaptflags: [
		"--auto-add-overlay",
		],
		@@ -166,6 +158,11 @@ android_app {
		"res",
		],

		licenses: [
		"Android-Apache-2.0",
		"packages_apps_DocumentsUI_res_drawable_pd_license",
		],

		required: ["privapp_whitelist_com.android.documentsui"],

		target_sdk_version: "30",