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

Merge "Revert^2 "Disable from-text stub build for sdk products"" into main am: 03aa6e725e

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

Change-Id: Id32152443558e7b6c18d8d6d38a424603068bf59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jihoon Kang
2023-11-17 10:16:57 +00:00
committed by Automerger Merge Worker
parent 5b17e679f6 03aa6e725e
commit 1644e0c15e
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/product.mk
View File

@@ -451,6 +451,8 @@ _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,6 +397,8 @@ $(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,3 +18,5 @@ 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,3 +30,5 @@ 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