Merge "Revert "Disable from-text stub build for sdk products"" into main
This commit is contained in:
@@ -451,8 +451,6 @@ _product_list_vars += PRODUCT_RELEASE_CONFIG_MAPS
|
||||
|
||||
_product_list_vars += PRODUCT_VALIDATION_CHECKS
|
||||
|
||||
_product_single_value_vars += PRODUCT_BUILD_FROM_SOURCE_STUB
|
||||
|
||||
.KATI_READONLY := _product_single_value_vars _product_list_vars
|
||||
_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)
|
||||
|
||||
|
@@ -397,8 +397,6 @@ $(call end_json_map)
|
||||
|
||||
$(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)
|
||||
|
||||
$(file >$(SOONG_VARIABLES).tmp,$(json_contents))
|
||||
|
@@ -18,5 +18,3 @@ PRODUCT_BRAND := Android
|
||||
PRODUCT_DEVICE := mainline_sdk
|
||||
|
||||
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true
|
||||
|
||||
PRODUCT_BUILD_FROM_SOURCE_STUB := true
|
@@ -30,5 +30,3 @@ PRODUCT_BRAND := Android
|
||||
PRODUCT_DEVICE := mainline_x86
|
||||
|
||||
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true
|
||||
|
||||
PRODUCT_BUILD_FROM_SOURCE_STUB := true
|
Reference in New Issue
Block a user