p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Build: Amend minidebug odex setup 

Add PRODUCT_OTHER_JAVA_DEBUG_INFO similar to PRODUCT_SYSTEM_SERVER_DEBUG_INFO.
Use WITH_DEXPREOPT_DEBUG_INFO as global default, and allow the product
to opt out by setting the above to "false."

(cherry picked from commit c3e151954f)

Bug: 75259124
Test: m
Merged-In: Id4a2e5d00a1b73a7e7a0a65146042c0aa0c1b411
Change-Id: Id4a2e5d00a1b73a7e7a0a65146042c0aa0c1b411
This commit is contained in:
Andreas Gampe 2018-03-19 14:28:15 -07:00
parent a27d4b7270
commit cdfe46b5a7
3 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/dex_preopt_odex_install.mk
View File

@ -285,19 +285,39 @@ $(my_built_dm): $(my_copied_vdex) $(ZIPTIME)
$(eval $(call copy-one-file,$(my_built_dm),$(my_installed_dm))) $(eval $(call copy-one-file,$(my_built_dm),$(my_installed_dm)))
endif endif
# By default, emit debug info.
my_dexpreopt_debug_info := true
# If the global setting suppresses mini-debug-info, disable it.
ifeq (false,$(WITH_DEXPREOPT_DEBUG_INFO))
my_dexpreopt_debug_info := false
endif
# PRODUCT_SYSTEM_SERVER_DEBUG_INFO overrides WITH_DEXPREOPT_DEBUG_INFO. # PRODUCT_SYSTEM_SERVER_DEBUG_INFO overrides WITH_DEXPREOPT_DEBUG_INFO.
my_system_server_debug_info := $(PRODUCT_SYSTEM_SERVER_DEBUG_INFO) # PRODUCT_OTHER_JAVA_DEBUG_INFO overrides WITH_DEXPREOPT_DEBUG_INFO.
ifeq (,$(filter eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS),$(LOCAL_MODULE)))
# Only enable for non-eng builds. ifeq (true,$(PRODUCT_SYSTEM_SERVER_DEBUG_INFO))
ifeq (,$(my_system_server_debug_info)) my_dexpreopt_debug_info := true
my_system_server_debug_info := true else ifeq (false,$(PRODUCT_SYSTEM_SERVER_DEBUG_INFO))
my_dexpreopt_debug_info := false
endif
else
ifeq (true,$(PRODUCT_OTHER_JAVA_DEBUG_INFO))
my_dexpreopt_debug_info := true
else ifeq (false,$(PRODUCT_OTHER_JAVA_DEBUG_INFO))
my_dexpreopt_debug_info := false
endif endif
endif endif
ifeq (true, $(my_system_server_debug_info)) # Never enable on eng.
ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS),$(LOCAL_MODULE))) ifeq (eng,$(filter eng, $(TARGET_BUILD_VARIANT)))
LOCAL_DEX_PREOPT_FLAGS += --generate-mini-debug-info my_dexpreopt_debug_info := false
endif endif
# Add dex2oat flag for debug-info/no-debug-info.
ifeq (true,$(my_dexpreopt_debug_info))
LOCAL_DEX_PREOPT_FLAGS += --generate-mini-debug-info
else ifeq (false,$(my_dexpreopt_debug_info))
LOCAL_DEX_PREOPT_FLAGS += --no-generate-mini-debug-info
endif endif
# Set the compiler reason to 'prebuilt' to identify the oat files produced # Set the compiler reason to 'prebuilt' to identify the oat files produced

1
core/product.mk
View File

@ -128,6 +128,7 @@ _product_var_list := \
PRODUCT_VENDOR_VERITY_PARTITION \ PRODUCT_VENDOR_VERITY_PARTITION \
PRODUCT_PRODUCT_VERITY_PARTITION \ PRODUCT_PRODUCT_VERITY_PARTITION \
PRODUCT_SYSTEM_SERVER_DEBUG_INFO \ PRODUCT_SYSTEM_SERVER_DEBUG_INFO \
PRODUCT_OTHER_JAVA_DEBUG_INFO \
PRODUCT_DEX_PREOPT_MODULE_CONFIGS \ PRODUCT_DEX_PREOPT_MODULE_CONFIGS \
PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER \ PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER \
PRODUCT_DEX_PREOPT_DEFAULT_FLAGS \ PRODUCT_DEX_PREOPT_DEFAULT_FLAGS \

2
core/product_config.mk
View File

@ -413,6 +413,8 @@ PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_COMPILER_FILTER)) $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_COMPILER_FILTER))
PRODUCT_SYSTEM_SERVER_DEBUG_INFO := \ PRODUCT_SYSTEM_SERVER_DEBUG_INFO := \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_DEBUG_INFO)) $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_DEBUG_INFO))
PRODUCT_OTHER_JAVA_DEBUG_INFO := \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OTHER_JAVA_DEBUG_INFO))
# Resolve and setup per-module dex-preopt configs. # Resolve and setup per-module dex-preopt configs.
PRODUCT_DEX_PREOPT_MODULE_CONFIGS := \ PRODUCT_DEX_PREOPT_MODULE_CONFIGS := \