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

Merge "Respect JIT-zygote config when generating boot image location."

Browse Source
This commit is contained in:
Ulyana Trafimovich
2020-01-07 10:48:45 +00:00
committed by Gerrit Code Review
parent 3ac9a12f5f d1c9bfe87a
commit 5268bfa61e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/dex_preopt_odex_install.mk
View File

@@ -111,6 +111,7 @@ endif
my_dexpreopt_archs := my_dexpreopt_archs :=
my_dexpreopt_images := my_dexpreopt_images :=
my_dexpreopt_images_deps := my_dexpreopt_images_deps :=
my_dexpreopt_image_locations :=
my_dexpreopt_infix := boot my_dexpreopt_infix := boot
ifeq (true, $(DEXPREOPT_USE_APEX_IMAGE)) ifeq (true, $(DEXPREOPT_USE_APEX_IMAGE))
my_dexpreopt_infix := apex my_dexpreopt_infix := apex
@@ -183,6 +184,8 @@ ifdef LOCAL_DEX_PREOPT
endif # TARGET_2ND_ARCH endif # TARGET_2ND_ARCH
endif # LOCAL_MODULE_CLASS endif # LOCAL_MODULE_CLASS
my_dexpreopt_image_locations += $(DEXPREOPT_IMAGE_LOCATIONS_$(my_dexpreopt_infix))
my_filtered_optional_uses_libraries := $(filter-out $(INTERNAL_PLATFORM_MISSING_USES_LIBRARIES), \ my_filtered_optional_uses_libraries := $(filter-out $(INTERNAL_PLATFORM_MISSING_USES_LIBRARIES), \
$(LOCAL_OPTIONAL_USES_LIBRARIES)) $(LOCAL_OPTIONAL_USES_LIBRARIES))
@@ -234,7 +237,7 @@ ifdef LOCAL_DEX_PREOPT
$(call end_json_map) $(call end_json_map)
$(call add_json_list, Archs, $(my_dexpreopt_archs)) $(call add_json_list, Archs, $(my_dexpreopt_archs))
$(call add_json_list, DexPreoptImages, $(my_dexpreopt_images)) $(call add_json_list, DexPreoptImages, $(my_dexpreopt_images))
$(call add_json_list, DexPreoptImageLocations, $(DEXPREOPT_IMAGE_LOCATIONS)) $(call add_json_list, DexPreoptImageLocations, $(my_dexpreopt_image_locations))
$(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, PreoptExtractedApk, $(my_preopt_for_extracted_apk))