diff options
| author | Xin Li <delphij@google.com> | 2021-10-06 22:53:42 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2021-10-06 22:53:42 +0000 |
| commit | 2fe2cb483cfed2bc22fe0542f54cf7ed263085cd (patch) | |
| tree | 061cde30e7631cb42d269b27c22f52888f1f98cf | |
| parent | 1f335c32a066c050b0bf046cd89740d698eabd57 (diff) | |
| parent | 5a7c594526d5fa0902c55fb44fa9961af4aaf616 (diff) | |
| download | gps-2fe2cb483cfed2bc22fe0542f54cf7ed263085cd.tar.gz | |
Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1
Bug: 202323961
Merged-In: Ibf8093550cfde749db7ba78ff1d462e090b920ce
Change-Id: I760025b3d8641178901186da26ac74c348b95fef
| -rw-r--r-- | METADATA | 3 | ||||
| -rw-r--r-- | etc/Android.mk | 4 |
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 |