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

Commit 9e0998b7 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

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

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
parent 25b71e06

core/product.mk

+2 −0
Original line number Diff line number Diff line
@@ -451,6 +451,8 @@ _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

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

+2 −0
Original line number Diff line number Diff line
@@ -18,3 +18,5 @@ 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

+2 −0
Original line number Diff line number Diff line
@@ -30,3 +30,5 @@ 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