Pass the target product to release-config
If you don't, release-config will read the TARGET_PRODUCT environment
variable to determine the product. This works in most cases, but it's
possible (e.g. via buildspec.mk) to change the target product within
make without modifying the environment variable. In these cases,
release-config will produce the config for one product but then the
build will read the config for a completely different product, leading
to build errors.
Instead, just pass the target product to release-config explicitly so it
generates the config for the product that the build is expecting.
Bug: 353351911
Test: TARGET_SKIP_OTA_PACKAGE="true" build/soong/soong_ui.bash \
--make-mode TARGET_PRODUCT=apps TARGET_RELEASE=next \
TARGET_BUILD_VARIANT=user droid dist \
ANDROID_BUILDSPEC=vendor/google_clockwork/build/app_build_spec.mk \
ALLOW_MISSING_DEPENDENCIES=true \
UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true \
RELAX_USES_LIBRARY_CHECK=true
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:310d7718439d074fe38b25b97eb609f6db66c3d6)
Merged-In: I63e80249ac702b5517f4a3cfd54c8a4dbd416794
Change-Id: I63e80249ac702b5517f4a3cfd54c8a4dbd416794
diff --git a/core/release_config.mk b/core/release_config.mk
index 2898868..fe2170e 100644
--- a/core/release_config.mk
+++ b/core/release_config.mk
@@ -131,6 +131,9 @@
_args += --guard=false
endif
_args += --allow-missing=true
+ ifneq (,$(TARGET_PRODUCT))
+ _args += --product $(TARGET_PRODUCT)
+ endif
_flags_dir:=$(OUT_DIR)/soong/release-config
_flags_file:=$(_flags_dir)/release_config-$(TARGET_PRODUCT)-$(TARGET_RELEASE).vars
# release-config generates $(_flags_varmk)