Loading core/Makefile +2 −0 Original line number Diff line number Diff line Loading @@ -3511,6 +3511,8 @@ $(SYSTEM_LINKER_CONFIG): $(INTERNAL_SYSTEMIMAGE_FILES) $(SYSTEM_LINKER_CONFIG_SO --output $@ --value "$(STUB_LIBRARIES)" --system "$(TARGET_OUT)" $(HOST_OUT_EXECUTABLES)/conv_linker_config append --source $@ --output $@ --key requireLibs \ --value "$(foreach lib,$(LLNDK_MOVED_TO_APEX_LIBRARIES), $(lib).so)" $(HOST_OUT_EXECUTABLES)/conv_linker_config append --source $@ --output $@ --key provideLibs \ --value "$(foreach lib,$(PRODUCT_EXTRA_STUB_LIBRARIES), $(lib).so)" $(call declare-1p-target,$(SYSTEM_LINKER_CONFIG),) $(call declare-license-deps,$(SYSTEM_LINKER_CONFIG),$(INTERNAL_SYSTEMIMAGE_FILES) $(SYSTEM_LINKER_CONFIG_SOURCE)) Loading core/android_soong_config_vars.mk +11 −0 Original line number Diff line number Diff line Loading @@ -175,6 +175,17 @@ endif # Required as platform_bootclasspath is using this namespace $(call soong_config_set,bootclasspath,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE)) # Add uprobestats build flag to soong $(call soong_config_set,ANDROID,release_uprobestats_module,$(RELEASE_UPROBESTATS_MODULE)) # Add uprobestats file move flags to soong, for both platform and module ifeq (true,$(RELEASE_UPROBESTATS_FILE_MOVE)) $(call soong_config_set,ANDROID,uprobestats_files_in_module,true) $(call soong_config_set,ANDROID,uprobestats_files_in_platform,false) else $(call soong_config_set,ANDROID,uprobestats_files_in_module,false) $(call soong_config_set,ANDROID,uprobestats_files_in_platform,true) endif # Enable Profiling module. Also used by platform_bootclasspath. $(call soong_config_set,ANDROID,release_package_profiling_module,$(RELEASE_PACKAGE_PROFILING_MODULE)) $(call soong_config_set,bootclasspath,release_package_profiling_module,$(RELEASE_PACKAGE_PROFILING_MODULE)) Loading core/build_id.mk +1 −1 Original line number Diff line number Diff line Loading @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. BUILD_ID=AP4A.240918.001 BUILD_ID=AP4A.240919.001 core/product.mk +4 −0 Original line number Diff line number Diff line Loading @@ -499,6 +499,10 @@ _product_single_value_vars += PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER # If set, build would generate system image from Soong-defined module. _product_single_value_vars += PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE # List of stub libraries specific to the product that are already present in the system image and # should be included in the system_linker_config. _product_list_vars += PRODUCT_EXTRA_STUB_LIBRARIES .KATI_READONLY := _product_single_value_vars _product_list_vars _product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars) Loading target/product/base_system.mk +11 −1 Original line number Diff line number Diff line Loading @@ -293,7 +293,6 @@ PRODUCT_PACKAGES += \ uiautomator \ uinput \ uncrypt \ uprobestats \ usbd \ vdc \ vintf \ Loading @@ -311,6 +310,17 @@ ifeq ($(RELEASE_CRASHRECOVERY_MODULE),true) endif # When we release uprobestats module ifeq ($(RELEASE_UPROBESTATS_MODULE),true) PRODUCT_PACKAGES += \ com.android.uprobestats \ else PRODUCT_PACKAGES += \ uprobestats \ endif # These packages are not used on Android TV ifneq ($(PRODUCT_IS_ATV),true) PRODUCT_PACKAGES += \ Loading Loading
core/Makefile +2 −0 Original line number Diff line number Diff line Loading @@ -3511,6 +3511,8 @@ $(SYSTEM_LINKER_CONFIG): $(INTERNAL_SYSTEMIMAGE_FILES) $(SYSTEM_LINKER_CONFIG_SO --output $@ --value "$(STUB_LIBRARIES)" --system "$(TARGET_OUT)" $(HOST_OUT_EXECUTABLES)/conv_linker_config append --source $@ --output $@ --key requireLibs \ --value "$(foreach lib,$(LLNDK_MOVED_TO_APEX_LIBRARIES), $(lib).so)" $(HOST_OUT_EXECUTABLES)/conv_linker_config append --source $@ --output $@ --key provideLibs \ --value "$(foreach lib,$(PRODUCT_EXTRA_STUB_LIBRARIES), $(lib).so)" $(call declare-1p-target,$(SYSTEM_LINKER_CONFIG),) $(call declare-license-deps,$(SYSTEM_LINKER_CONFIG),$(INTERNAL_SYSTEMIMAGE_FILES) $(SYSTEM_LINKER_CONFIG_SOURCE)) Loading
core/android_soong_config_vars.mk +11 −0 Original line number Diff line number Diff line Loading @@ -175,6 +175,17 @@ endif # Required as platform_bootclasspath is using this namespace $(call soong_config_set,bootclasspath,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE)) # Add uprobestats build flag to soong $(call soong_config_set,ANDROID,release_uprobestats_module,$(RELEASE_UPROBESTATS_MODULE)) # Add uprobestats file move flags to soong, for both platform and module ifeq (true,$(RELEASE_UPROBESTATS_FILE_MOVE)) $(call soong_config_set,ANDROID,uprobestats_files_in_module,true) $(call soong_config_set,ANDROID,uprobestats_files_in_platform,false) else $(call soong_config_set,ANDROID,uprobestats_files_in_module,false) $(call soong_config_set,ANDROID,uprobestats_files_in_platform,true) endif # Enable Profiling module. Also used by platform_bootclasspath. $(call soong_config_set,ANDROID,release_package_profiling_module,$(RELEASE_PACKAGE_PROFILING_MODULE)) $(call soong_config_set,bootclasspath,release_package_profiling_module,$(RELEASE_PACKAGE_PROFILING_MODULE)) Loading
core/build_id.mk +1 −1 Original line number Diff line number Diff line Loading @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. BUILD_ID=AP4A.240918.001 BUILD_ID=AP4A.240919.001
core/product.mk +4 −0 Original line number Diff line number Diff line Loading @@ -499,6 +499,10 @@ _product_single_value_vars += PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER # If set, build would generate system image from Soong-defined module. _product_single_value_vars += PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE # List of stub libraries specific to the product that are already present in the system image and # should be included in the system_linker_config. _product_list_vars += PRODUCT_EXTRA_STUB_LIBRARIES .KATI_READONLY := _product_single_value_vars _product_list_vars _product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars) Loading
target/product/base_system.mk +11 −1 Original line number Diff line number Diff line Loading @@ -293,7 +293,6 @@ PRODUCT_PACKAGES += \ uiautomator \ uinput \ uncrypt \ uprobestats \ usbd \ vdc \ vintf \ Loading @@ -311,6 +310,17 @@ ifeq ($(RELEASE_CRASHRECOVERY_MODULE),true) endif # When we release uprobestats module ifeq ($(RELEASE_UPROBESTATS_MODULE),true) PRODUCT_PACKAGES += \ com.android.uprobestats \ else PRODUCT_PACKAGES += \ uprobestats \ endif # These packages are not used on Android TV ifneq ($(PRODUCT_IS_ATV),true) PRODUCT_PACKAGES += \ Loading