Merge "release config is now protobuf" into main (e6370eae) · Commits · e / os / android_build

target/product/go_defaults.mk

+1 −4

Original line number	Diff line number	Diff line
		@@ -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 += \