From a1c55702365bce1b81497ffbd5c111562ed90a7e Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Fri, 24 May 2024 15:51:53 +0800 Subject: [PATCH 1/2] Switch makefile owners to MK_OWNERS Bug: 278167548 Change-Id: I49eb74361be6c0ddf7a609b4615f6bdf45e47b51 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index f3899b9..70afc5a 100644 --- a/OWNERS +++ b/OWNERS @@ -1,4 +1,4 @@ per-file powerhint-akita.json = jenhaochen@google.com,wvw@google.com,joaodias@google.com # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/MK_OWNERS From d27454c1706aaeeae7131080e422a77377814a7b Mon Sep 17 00:00:00 2001 From: Xin Li Date: Thu, 30 May 2024 10:23:09 -0700 Subject: [PATCH 2/2] akita: only depend on vendor/ project if they are present. Bug: 317784824 Merged-In: I52d615ccedbd3a3f504a6be2d607808516c1af86 Change-Id: I6db75201d4bb3c9a675447f9f0f106af5ae191dd --- device-akita.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-akita.mk b/device-akita.mk index c52d0c5..11c6919 100644 --- a/device-akita.mk +++ b/device-akita.mk @@ -14,7 +14,7 @@ # limitations under the License. # -PRODUCT_RELEASE_CONFIG_MAPS += vendor/google_devices/release/phones/release_config_map.mk +PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_devices/release/phones/release_config_map.mk) TARGET_KERNEL_DIR ?= device/google/akita-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/akita-kernel/kernel-headers