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

flag guarded move of uprobestats into Mainline

Browse Source 
Bug: 355315669
Test: m
Ignore-AOSP-First: uprobestats is an internal-first project
Change-Id: Ifc74630a56a0be8669f0fb56ba6c8ba5f6435fc6
This commit is contained in:
Yu-Ting Tseng
2024-09-13 09:27:14 -07:00
parent 5bbf6701eb
commit 4688186da8
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/android_soong_config_vars.mk
View File

@@ -175,6 +175,17 @@ endif
# Required as platform_bootclasspath is using this namespace # Required as platform_bootclasspath is using this namespace
$(call soong_config_set,bootclasspath,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE)) $(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. # 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,ANDROID,release_package_profiling_module,$(RELEASE_PACKAGE_PROFILING_MODULE))
$(call soong_config_set,bootclasspath,release_package_profiling_module,$(RELEASE_PACKAGE_PROFILING_MODULE)) $(call soong_config_set,bootclasspath,release_package_profiling_module,$(RELEASE_PACKAGE_PROFILING_MODULE))

12
target/product/base_system.mk
View File

@@ -293,7 +293,6 @@ PRODUCT_PACKAGES += \
uiautomator \ uiautomator \
uinput \ uinput \
uncrypt \ uncrypt \
uprobestats \
usbd \ usbd \
vdc \ vdc \
vintf \ vintf \
@@ -311,6 +310,17 @@ ifeq ($(RELEASE_CRASHRECOVERY_MODULE),true)
endif 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 # These packages are not used on Android TV
ifneq ($(PRODUCT_IS_ATV),true) ifneq ($(PRODUCT_IS_ATV),true)
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \