From c8c516a89ba8ff008515d381e93bee68611d2d68 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 9 Dec 2021 10:30:19 -0800 Subject: [PATCH] Strip ODM_MANIFEST_SKUS Otherwise it gets a different value when using starlark board config, causing the ninja files to differ. Bug: 201700692 Test: ./build/bazel/ci/rbc_regression_test.sh -b aosp_crosshatch_car-userdebug Change-Id: I55870f031b779202db720f10d7d502f9d868e1f6 --- core/board_config.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/board_config.mk b/core/board_config.mk index 821607e950..6bbb3a0eee 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -159,6 +159,7 @@ _board_strip_list += BOARD_GKI_SIGNING_ALGORITHM _board_strip_list += BOARD_GKI_SIGNING_KEY_PATH _board_strip_list += BOARD_MKBOOTIMG_ARGS _board_strip_list += BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE +_board_strip_list += ODM_MANIFEST_SKUS _build_broken_var_list := \