diff options
| author | Xin Li <delphij@google.com> | 2021-10-06 22:52:52 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2021-10-06 22:52:52 +0000 |
| commit | b96fc216575927fa1467782d14dc778cee0e7036 (patch) | |
| tree | 8abbab950346d8c319bc0847b328140cc6a64c0b | |
| parent | 82296e8fcb6ebda74d67a5668c93f81734fcacc6 (diff) | |
| parent | f6ec19ee96be255ed64e4c994db7b8835cb812d6 (diff) | |
| download | beagle-x15-b96fc216575927fa1467782d14dc778cee0e7036.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: Id6088ae38b04e4587c41eed55b0a93051c4b353e
Change-Id: I5e9e6c5be2242515af9d88a6968e987cf623eff5
| -rw-r--r-- | MODULE_LICENSE_APACHE2 | 0 | ||||
| -rw-r--r-- | MODULE_LICENSE_BSD | 0 | ||||
| -rw-r--r-- | MODULE_LICENSE_MIT | 0 | ||||
| -rw-r--r-- | build/tasks/boot_fit.mk | 2 | ||||
| -rw-r--r-- | build/tasks/dtimages.mk | 4 |
5 files changed, 3 insertions, 3 deletions
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/MODULE_LICENSE_APACHE2 diff --git a/MODULE_LICENSE_BSD b/MODULE_LICENSE_BSD new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/MODULE_LICENSE_BSD diff --git a/MODULE_LICENSE_MIT b/MODULE_LICENSE_MIT new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/MODULE_LICENSE_MIT diff --git a/build/tasks/boot_fit.mk b/build/tasks/boot_fit.mk index f2becde..2852cf7 100644 --- a/build/tasks/boot_fit.mk +++ b/build/tasks/boot_fit.mk @@ -30,7 +30,7 @@ endif include $(CLEAR_VARS) LOCAL_MODULE := bootfitimage -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT +LOCAL_LICENSE_KINDS := legacy_notice LOCAL_LICENSE_CONDITIONS := notice LOCAL_ADDITIONAL_DEPENDENCIES := $(BOOTIMG_FIT) include $(BUILD_PHONY_PACKAGE) diff --git a/build/tasks/dtimages.mk b/build/tasks/dtimages.mk index b54577d..ded4e63 100644 --- a/build/tasks/dtimages.mk +++ b/build/tasks/dtimages.mk @@ -28,14 +28,14 @@ $(DTBOIMAGE): $(DTBO_FILES) include $(CLEAR_VARS) LOCAL_MODULE := dtbimage -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT +LOCAL_LICENSE_KINDS := legacy_notice LOCAL_LICENSE_CONDITIONS := notice LOCAL_ADDITIONAL_DEPENDENCIES := $(DTBIMAGE) include $(BUILD_PHONY_PACKAGE) include $(CLEAR_VARS) LOCAL_MODULE := dtboimage -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT +LOCAL_LICENSE_KINDS := legacy_notice LOCAL_LICENSE_CONDITIONS := notice LOCAL_ADDITIONAL_DEPENDENCIES := $(DTBOIMAGE) include $(BUILD_PHONY_PACKAGE) |