From 608493e0ff82cbd5cf654b6479b8d39e18dfc375 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Fri, 17 Nov 2023 00:58:40 +0000 Subject: [PATCH] Revert "Disable from-text stub build for sdk products" Revert submission 2832580-sdk-from-source-stub Reason for revert: Breaking sdk builds Reverted changes: /q/submissionid:2832580-sdk-from-source-stub Change-Id: Id2e1bf4b5d513d12bb794405a74dfdbed870c4e1 --- core/product.mk | 2 -- core/soong_config.mk | 2 -- target/product/mainline_sdk.mk | 2 -- target/product/sdk.mk | 2 -- 4 files changed, 8 deletions(-) diff --git a/core/product.mk b/core/product.mk index 3667bb17f3..0d5a07d632 100644 --- a/core/product.mk +++ b/core/product.mk @@ -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) diff --git a/core/soong_config.mk b/core/soong_config.mk index 947f66f8c2..08e9a653ab 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -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)) diff --git a/target/product/mainline_sdk.mk b/target/product/mainline_sdk.mk index cb23bc8c92..0ea72cc0bb 100644 --- a/target/product/mainline_sdk.mk +++ b/target/product/mainline_sdk.mk @@ -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 diff --git a/target/product/sdk.mk b/target/product/sdk.mk index b9ccad38d1..fff8d4caa3 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -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