From f982547c1b5d5ed788958cac2c9a2d682dd501c2 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Tue, 25 Jun 2024 16:06:17 -0700 Subject: [PATCH] release config is now protobuf Use `release_config_map.textproto` instead of relying on platform/build to intuit that for us. Bug: 328495189 Flag: build.RELEASE_BUILD_FLAGS_IN_PROTOBUF Test: manual, TH Ignore-AOSP-First: resolving automerger conflict Merged-In: Ia3ae6787183208a216dc4ea26c2fc3a9e4f56054 Change-Id: I4573cc04c8bf3116e1a8b728b819b09d6b3a87a3 --- target/product/go_defaults.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/target/product/go_defaults.mk b/target/product/go_defaults.mk index 7fbc09db74..4627fde189 100644 --- a/target/product/go_defaults.mk +++ b/target/product/go_defaults.mk @@ -17,10 +17,7 @@ # Inherit common Android Go defaults. $(call inherit-product, build/make/target/product/go_defaults_common.mk) -PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_shared/build/release/go_devices/release_config_map.mk) - -# TODO (b/342265627): Remove v/g/r once all the flags have been moved to v/g_s/b/r -PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google/release/go_devices/release_config_map.mk) +PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_shared/build/release/go_devices/release_config_map.textproto) # Add the system properties. TARGET_SYSTEM_PROP += \