diff options
| author | Xin Li <delphij@google.com> | 2021-10-06 22:53:43 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2021-10-06 22:53:43 +0000 |
| commit | 39270692b07ec72a47656e3170d29d84f723ef57 (patch) | |
| tree | 6bbb85006df6b5758c9a6d6777f198dfb1b358c0 | |
| parent | 6433541cc5d309376f699f5aadf3cc383d5ce44d (diff) | |
| parent | a1fc3d64281bcae990b7708fa89b98f4292e8f9c (diff) | |
| download | gps-39270692b07ec72a47656e3170d29d84f723ef57.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: I68b35848a5369cb2ef0186cbe87594318304ff74
Change-Id: Id47c6f5cea361d3aaed3df79bfbf38ace3db221c
| -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 |