StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ib31bc58dd30412c6c822531df3b227b1f9e4093e
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:35:16 +00:00
committed by Automerger Merge Worker
parent 0f20cbc643 b0146455c7
commit c1fc7602aa
4 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/product.mk
View File

@@ -451,8 +451,6 @@ _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)

2
core/soong_config.mk
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, 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))

2
target/product/mainline_sdk.mk
View File

@@ -18,5 +18,3 @@ 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

2
target/product/sdk.mk
View File

@@ -30,5 +30,3 @@ 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