Merge Android 12
Bug: 202323961
Merged-In: Ibf8093550cfde749db7ba78ff1d462e090b920ce
Change-Id: I760025b3d8641178901186da26ac74c348b95fef
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+ license_type: NOTICE
+}
diff --git a/etc/Android.mk b/etc/Android.mk
index 1a80c6e..b41547a 100644
--- a/etc/Android.mk
+++ b/etc/Android.mk
@@ -3,7 +3,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := gps.conf
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
+LOCAL_LICENSE_KINDS := legacy_notice
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional
@@ -14,7 +14,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := flp.conf
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
+LOCAL_LICENSE_KINDS := legacy_notice
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional