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

Revert^2 "Disable from-text stub build for sdk products"

Browse Source 
This change introduces `PRODUCT_BUILD_FROM_SOURCE_STUB` product
variable, which is set to true for sdk targets.

This change resubmits https://r.android.com/2834692.

Test: m TARGET_PRODUCT=sdk TARGET_RELEASE=trunk_staging sdk and inspect ninja query to verify that stubs are built from source
Bug: 311203379
Change-Id: I7d9f833ae76ceabbf2ce4df0141688e24ea164c8
This commit is contained in:
Jihoon Kang
2023-11-16 19:04:44 +00:00
parent 25b71e0689
commit 9e0998b777
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