summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-08-14 06:31:00 +0000
committerXin Li <delphij@google.com>2021-08-14 06:31:00 +0000
commita1fc3d64281bcae990b7708fa89b98f4292e8f9c (patch)
tree6bbb85006df6b5758c9a6d6777f198dfb1b358c0
parent6433541cc5d309376f699f5aadf3cc383d5ce44d (diff)
parent99847b6faf9ab1f0c7ee6c69337b6b3205d2605c (diff)
downloadgps-a1fc3d64281bcae990b7708fa89b98f4292e8f9c.tar.gz
Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961
Merged-In: Ieae6aa97bd6fd4ce3851a8887c0818d8dfa53848 Change-Id: I68b35848a5369cb2ef0186cbe87594318304ff74
-rw-r--r--METADATA3
-rw-r--r--etc/Android.mk4
2 files changed, 5 insertions, 2 deletions
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 @@ LOCAL_PATH := $(call my-dir)
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 $(BUILD_PREBUILT)
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