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

Commit b0146455 authored by Jihoon Kang's avatar Jihoon Kang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ifda62b2e985c5e47b7a1f40351b5fb063b51a42c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d763858 3666e601

core/product.mk

+0 −2
Original line number Diff line number Diff line
@@ -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)

core/soong_config.mk

+0 −2
Original line number Diff line number Diff line
@@ -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))

target/product/mainline_sdk.mk

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



PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true
 


PRODUCT_BUILD_FROM_SOURCE_STUB := true
 
 No newline at end of file

target/product/sdk.mk

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



PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API := true
 


PRODUCT_BUILD_FROM_SOURCE_STUB := true
 
 No newline at end of file