From 91fa4323c8eec8a70037182fcd8c21ff38ec920b Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Fri, 29 Mar 2024 14:50:50 -0700 Subject: [PATCH] Do not use build/trunk_release/release_config_map.mk We won't be adding build/trunk_release to the manifest. Bug: 328495189 Test: TH Change-Id: I0ef2a900568daccfbd2ef1d8949674e6f2a63e00 --- core/release_config.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/release_config.mk b/core/release_config.mk index a7b5b3ff38..3e51af5a44 100644 --- a/core/release_config.mk +++ b/core/release_config.mk @@ -41,8 +41,7 @@ # which has OWNERS control. If it isn't let others define their own. # TODO: Remove wildcard for build/release one when all branch manifests # have updated. -config_map_files := $(wildcard build/trunk_release/release_config_map.mk) \ - $(wildcard build/release/release_config_map.mk) \ +config_map_files := $(wildcard build/release/release_config_map.mk) \ $(wildcard vendor/google_shared/build/release/release_config_map.mk) \ $(if $(wildcard vendor/google/release/release_config_map.mk), \ vendor/google/release/release_config_map.mk, \