diff --git a/Android.bp b/Android.bp
index 03c85c1..c9f7e86 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,40 @@
 
 soong_namespace {}
 
+// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
+//     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+//     DEPENDING ON IT IN YOUR PROJECT. ***
+package {
+    default_applicable_licenses: ["device_linaro_dragonboard_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_linaro_dragonboard_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-OpenSSL",
+        "legacy_by_exception_only", // by exception only
+    ],
+    // large-scale-change unable to identify any license_text files
+}
+
 subdirs = [
     "qcom/pd-mapper",
     "qcom/qrtr",
diff --git a/audio/Android.mk b/audio/Android.mk
index 90c18fa..4356384 100644
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -24,6 +24,8 @@
 
 LOCAL_HEADER_LIBRARIES += libhardware_headers
 LOCAL_MODULE := audio.primary.$(TARGET_BOARD_PLATFORM)
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_VENDOR_MODULE := true
 
diff --git a/gralloc/Android.mk b/gralloc/Android.mk
index ec1c38e..e517e3d 100644
--- a/gralloc/Android.mk
+++ b/gralloc/Android.mk
@@ -39,6 +39,8 @@
 LOCAL_C_INCLUDES += system/core/libsystem/include system/core
 
 LOCAL_MODULE := gralloc.gbm
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_PROPRIETARY_MODULE := true
@@ -51,6 +53,8 @@
 	$(LOCAL_PATH)
 
 LOCAL_MODULE := libgralloc_drm
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_TAGS := optional
 LOCAL_PROPRIETARY_MODULE := true
 
diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk
index 913cb22..c52b417 100644
--- a/libmemtrack/Android.mk
+++ b/libmemtrack/Android.mk
@@ -26,4 +26,6 @@
 LOCAL_SHARED_LIBRARIES := liblog libhardware
 LOCAL_SRC_FILES := memtrack_dragonboard.c
 LOCAL_MODULE := memtrack.default
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 include $(BUILD_SHARED_LIBRARY)
diff --git a/qcom/pd-mapper/Android.bp b/qcom/pd-mapper/Android.bp
index 3bdbc32..7e86231 100644
--- a/qcom/pd-mapper/Android.bp
+++ b/qcom/pd-mapper/Android.bp
@@ -1,3 +1,22 @@
+package {
+    default_applicable_licenses: [
+        "device_linaro_dragonboard_qcom_pd-mapper_license",
+    ],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "device_linaro_dragonboard_qcom_pd-mapper_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 cc_binary {
     name: "pd-mapper",
     vendor: true,
diff --git a/qcom/qrtr/Android.bp b/qcom/qrtr/Android.bp
index 9544a75..8103bb6 100644
--- a/qcom/qrtr/Android.bp
+++ b/qcom/qrtr/Android.bp
@@ -1,3 +1,22 @@
+package {
+    default_applicable_licenses: [
+        "device_linaro_dragonboard_qcom_qrtr_license",
+    ],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "device_linaro_dragonboard_qcom_qrtr_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 cc_library {
     name: "libqrtr",
     vendor: true,
diff --git a/qcom/rmtfs/Android.bp b/qcom/rmtfs/Android.bp
index 7865a99..82cf7e1 100644
--- a/qcom/rmtfs/Android.bp
+++ b/qcom/rmtfs/Android.bp
@@ -1,3 +1,22 @@
+package {
+    default_applicable_licenses: [
+        "device_linaro_dragonboard_qcom_rmtfs_license",
+    ],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "device_linaro_dragonboard_qcom_rmtfs_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 cc_binary {
     name: "rmtfs",
     vendor: true,
diff --git a/qcom/tqftpserv/Android.bp b/qcom/tqftpserv/Android.bp
index b2c5090..248c323 100644
--- a/qcom/tqftpserv/Android.bp
+++ b/qcom/tqftpserv/Android.bp
@@ -1,3 +1,22 @@
+package {
+    default_applicable_licenses: [
+        "device_linaro_dragonboard_qcom_tqftpserv_license",
+    ],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "device_linaro_dragonboard_qcom_tqftpserv_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 cc_binary {
     name: "tqftpserv",
     vendor: true,
