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

This commit is contained in:
Jihoon Kang 2023-11-17 09:39:06 +00:00 committed by Gerrit Code Review
commit 03aa6e725e
4 changed files with 8 additions and 0 deletions

View file

@ -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)

View file

@ -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))

View file

@ -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

View file

@ -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