diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-07 00:16:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-07 00:16:37 +0000 |
| commit | d5f0022d182334ee856ff1c07b95b442586412c9 (patch) | |
| tree | 051bb5a58a248249674e79ee0fa49d0ff35f8d58 | |
| parent | ca8b7b08b909459d0921fa1d233ab7fd422e5acc (diff) | |
| parent | 67caafe89052bbe73ee2dfa280952050fa11095f (diff) | |
| download | goldfish-tmp_amf_315507370.tar.gz | |
Merge "Fix comments in kernel build files" into main am: 67caafe890tmp_amf_315507370
Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/2862757
Change-Id: I5e7233f63e3eaea97d998b10f7d7bddbe6d4fd73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | board/kernel/arm64.mk | 18 | ||||
| -rw-r--r-- | board/kernel/x86_64.mk | 18 |
2 files changed, 34 insertions, 2 deletions
diff --git a/board/kernel/arm64.mk b/board/kernel/arm64.mk index 14631fb2..8c04ba14 100644 --- a/board/kernel/arm64.mk +++ b/board/kernel/arm64.mk @@ -1,4 +1,20 @@ -# we support OTA - suppress the build warning +# +# Copyright (C) 2023 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# we do NOT support OTA - suppress the build warning PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false TARGET_KERNEL_USE ?= 6.1 diff --git a/board/kernel/x86_64.mk b/board/kernel/x86_64.mk index 95b98a6e..3781656e 100644 --- a/board/kernel/x86_64.mk +++ b/board/kernel/x86_64.mk @@ -1,4 +1,20 @@ -# we support OTA - suppress the build warning +# +# Copyright (C) 2023 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# we do NOT support OTA - suppress the build warning PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false TARGET_KERNEL_USE ?= 6.1 |