summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-12-07 00:29:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-07 00:29:11 +0000
commita2993189610d5b62f77c6973aa1c268954f34e95 (patch)
treeb67539551e0c64d7878859267d4daf2e035f9815
parentef70af6351c48e4406e76d984bf184a80b71442b (diff)
parent67caafe89052bbe73ee2dfa280952050fa11095f (diff)
downloadgoldfish-a2993189610d5b62f77c6973aa1c268954f34e95.tar.gz
Merge "Fix comments in kernel build files" into main am: 67caafe890
Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/2862757 Change-Id: Icf8874310d17c5c054380bfc60d45963fa4a0663 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--board/kernel/arm64.mk18
-rw-r--r--board/kernel/x86_64.mk18
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