Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be6b253f authored Nov 17, 2023 by Jihoon Kang Committed by Automerger Merge Worker Nov 17, 2023

Merge "Revert^2 "Disable from-text stub build for sdk products"" into main am: 03aa6e72

Original change: https://android-review.googlesource.com/c/platform/build/+/2836090

Change-Id: I5909c66e41f8671834df9e442a37b02a37c29a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents f145ffb2 03aa6e72

core/product.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -451,6 +451,8 @@ _product_list_vars += PRODUCT_RELEASE_CONFIG_MAPS

	_product_list_vars += PRODUCT_VALIDATION_CHECKS		_product_list_vars += PRODUCT_VALIDATION_CHECKS

			_product_single_value_vars += PRODUCT_BUILD_FROM_SOURCE_STUB

	.KATI_READONLY := _product_single_value_vars _product_list_vars		.KATI_READONLY := _product_single_value_vars _product_list_vars
	_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)		_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

core/soong_config.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -397,6 +397,8 @@ $(call end_json_map)

	$(call add_json_bool, NextReleaseHideFlaggedApi, $(filter true,$(PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API)))		$(call add_json_bool, NextReleaseHideFlaggedApi, $(filter true,$(PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API)))

			$(call add_json_bool, BuildFromSourceStub, $(findstring true,$(PRODUCT_BUILD_FROM_SOURCE_STUB) $(BUILD_FROM_SOURCE_STUB)))

	$(call json_end)		$(call json_end)

	$(file >$(SOONG_VARIABLES).tmp,$(json_contents))		$(file >$(SOONG_VARIABLES).tmp,$(json_contents))

target/product/mainline_sdk.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,3 +18,5 @@ PRODUCT_BRAND := Android
	PRODUCT_DEVICE := mainline_sdk		PRODUCT_DEVICE := mainline_sdk

	PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true		PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true

			PRODUCT_BUILD_FROM_SOURCE_STUB := true
			No newline at end of file

target/product/sdk.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30,3 +30,5 @@ PRODUCT_BRAND := Android
	PRODUCT_DEVICE := mainline_x86		PRODUCT_DEVICE := mainline_x86

	PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true		PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true

			PRODUCT_BUILD_FROM_SOURCE_STUB := true
			No newline at end of file