Declare license metadata for copied files. am: 8c9fedfecd

Original change: https://android-review.googlesource.com/c/device/ti/beagle-x15/+/1984533

Change-Id: If8acb7d141edc3421e8e507f65a5b34132bef3cc

5 files changed, 7 insertions, 51 deletions

diff --git a/Android.bp b/Android.bp
index 75eb523..5ecf01e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,30 +15,5 @@
 soong_namespace {}
 
 package {
-    default_applicable_licenses: ["device_ti_beagle_x15_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: "device_ti_beagle_x15_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-MIT",
-    ],
-    // large-scale-change unable to identify any license_text files
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
diff --git a/Android.mk b/Android.mk
index 6768aca..142eb37 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,6 +22,10 @@
 
 ifneq ($(filter beagle_x15%, $(TARGET_DEVICE)),)
 
+$(eval $(call declare-1p-copy-files,device/ti/beagle_x15/,.rc))
+$(eval $(call declare-1p-copy-files,device/ti/beagle_x15/,.xml))
+$(eval $(call declare-1p-copy-files,device/ti/beagle_x15/,fstab.beagle_x15board))
+
 LOCAL_PATH := $(call my-dir)
 
 # if some modules are built directly from this directory (not subdirectories),
diff --git a/gpu/Android.bp b/gpu/Android.bp
index e9f04a7..ba395c0 100644
--- a/gpu/Android.bp
+++ b/gpu/Android.bp
@@ -19,19 +19,6 @@ package {
     default_applicable_licenses: ["device_ti_beagle_x15_gpu_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: "device_ti_beagle_x15_gpu_license",
diff --git a/gralloc/Android.bp b/gralloc/Android.bp
index cf24ace..0ad369b 100644
--- a/gralloc/Android.bp
+++ b/gralloc/Android.bp
@@ -1,12 +1,6 @@
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "device_ti_beagle_x15_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    //   SPDX-license-identifier-BSD
-    //   SPDX-license-identifier-MIT
-    default_applicable_licenses: ["device_ti_beagle_x15_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 cc_library_shared {
diff --git a/recovery/Android.bp b/recovery/Android.bp
index 373445a..6096fac 100644
--- a/recovery/Android.bp
+++ b/recovery/Android.bp
@@ -16,11 +16,7 @@
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "device_ti_beagle_x15_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["device_ti_beagle_x15_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 cc_library_static {