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

Remove PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK.

Browse Source 
This was added by r.android.com/513843 to force dexpreopt some GMS core
modules even if dexpreopt is disabled, to avoid some memory usage
regression. We no longer need it because dexpreopt is never disabled on
production builds.

Bug: 313505540
Test: m
Change-Id: Iff7f1d340a3ecd64cdc3d2f83f9c37c109a81fda
This commit is contained in:
Jiakai Zhang
2023-11-28 13:34:38 +00:00
parent 8737d4baf5
commit 364e9c39de
5 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/app_prebuilt_internal.mk
View File

@@ -85,11 +85,6 @@ $(my_extracted_apk): $(my_prebuilt_src_file)
my_prebuilt_src_file := $(my_extracted_apk) my_prebuilt_src_file := $(my_extracted_apk)
my_extracted_apk := my_extracted_apk :=
my_extract_apk := my_extract_apk :=
ifeq ($(PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK),true)
# If the product property is set, always preopt for extracted modules to prevent executing out of
# the APK.
my_preopt_for_extracted_apk := true
endif
endif endif
rs_compatibility_jni_libs := rs_compatibility_jni_libs :=

7
core/dex_preopt_odex_install.mk
View File

@@ -60,10 +60,8 @@ ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file)$(LOCAL_SOONG_DEX_JAR)))
LOCAL_DEX_PREOPT := LOCAL_DEX_PREOPT :=
endif endif
ifneq (true,$(my_preopt_for_extracted_apk)) ifeq (true,$(WITH_DEXPREOPT_ART_BOOT_IMG_ONLY))
ifeq (true,$(WITH_DEXPREOPT_ART_BOOT_IMG_ONLY)) LOCAL_DEX_PREOPT :=
LOCAL_DEX_PREOPT :=
endif
endif endif
my_process_profile := my_process_profile :=
@@ -392,7 +390,6 @@ ifeq ($(my_create_dexpreopt_config), true)
$(call add_json_list, DexPreoptImageLocationsOnDevice,$(my_dexpreopt_image_locations_on_device)) $(call add_json_list, DexPreoptImageLocationsOnDevice,$(my_dexpreopt_image_locations_on_device))
$(call add_json_list, PreoptBootClassPathDexFiles, $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES)) $(call add_json_list, PreoptBootClassPathDexFiles, $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES))
$(call add_json_list, PreoptBootClassPathDexLocations,$(DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS)) $(call add_json_list, PreoptBootClassPathDexLocations,$(DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS))
$(call add_json_bool, PreoptExtractedApk, $(my_preopt_for_extracted_apk))
$(call add_json_bool, NoCreateAppImage, $(filter false,$(LOCAL_DEX_PREOPT_APP_IMAGE))) $(call add_json_bool, NoCreateAppImage, $(filter false,$(LOCAL_DEX_PREOPT_APP_IMAGE)))
$(call add_json_bool, ForceCreateAppImage, $(filter true,$(LOCAL_DEX_PREOPT_APP_IMAGE))) $(call add_json_bool, ForceCreateAppImage, $(filter true,$(LOCAL_DEX_PREOPT_APP_IMAGE)))
$(call add_json_bool, PresignedPrebuilt, $(filter PRESIGNED,$(LOCAL_CERTIFICATE))) $(call add_json_bool, PresignedPrebuilt, $(filter PRESIGNED,$(LOCAL_CERTIFICATE)))

1
core/prebuilt_internal.mk
View File

@@ -63,4 +63,3 @@ $(if $(filter-out $(SOONG_ANDROID_MK),$(LOCAL_MODULE_MAKEFILE)), \
$(built_module) : $(LOCAL_ADDITIONAL_DEPENDENCIES) $(built_module) : $(LOCAL_ADDITIONAL_DEPENDENCIES)
my_prebuilt_src_file := my_prebuilt_src_file :=
my_preopt_for_extracted_apk :=

2
core/product.mk
View File

@@ -183,8 +183,6 @@ _product_list_vars += PRODUCT_SYSTEM_SERVER_JARS_EXTRA
# Set to true to disable <uses-library> checks for a product. # Set to true to disable <uses-library> checks for a product.
_product_list_vars += PRODUCT_BROKEN_VERIFY_USES_LIBRARIES _product_list_vars += PRODUCT_BROKEN_VERIFY_USES_LIBRARIES
# All of the apps that we force preopt, this overrides WITH_DEXPREOPT.
_product_list_vars += PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK
_product_list_vars += PRODUCT_DEXPREOPT_SPEED_APPS _product_list_vars += PRODUCT_DEXPREOPT_SPEED_APPS
_product_list_vars += PRODUCT_LOADED_BY_PRIVILEGED_MODULES _product_list_vars += PRODUCT_LOADED_BY_PRIVILEGED_MODULES
_product_single_value_vars += PRODUCT_VBOOT_SIGNING_KEY _product_single_value_vars += PRODUCT_VBOOT_SIGNING_KEY

4
target/product/go_defaults_common.mk
View File

@@ -24,10 +24,6 @@ PRODUCT_VENDOR_PROPERTIES += \
# Speed profile services and wifi-service to reduce RAM and storage. # Speed profile services and wifi-service to reduce RAM and storage.
PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := speed-profile PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := speed-profile
# Always preopt extracted APKs to prevent extracting out of the APK for gms
# modules.
PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK := true
# Use a profile based boot image for this device. Note that this is currently a # Use a profile based boot image for this device. Note that this is currently a
# generic profile and not Android Go optimized. # generic profile and not Android Go optimized.
PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE := true PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE := true