Merge "Revert "Disable from-text stub build for sdk products"" into main am: 3666e601ec

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

Change-Id: Ifda62b2e985c5e47b7a1f40351b5fb063b51a42c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jihoon Kang 2023-11-17 01:20:06 +00:00 committed by Automerger Merge Worker
commit b0146455c7
4 changed files with 0 additions and 8 deletions

View file

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

View file

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

View file

@ -18,5 +18,3 @@ PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_sdk
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true
PRODUCT_BUILD_FROM_SOURCE_STUB := true

View file

@ -30,5 +30,3 @@ PRODUCT_BRAND := Android
PRODUCT_DEVICE := mainline_x86
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true
PRODUCT_BUILD_FROM_SOURCE_STUB := true