Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94f5f932 authored by Mathieu Chartier's avatar Mathieu Chartier
Browse files

Add PRODUCT_SYSTEM_SERVER_DEBUG_INFO property 

Used for specifying if a product should get system server mini debug
info. Defaults to true.

Can be disabled by doing
PRODUCT_SYSTEM_SERVER_DEBUG_INFO := false

The property overrides WITH_DEXPREOPT_DEBUG_INFO, so if
PRODUCT_SYSTEM_SERVER_DEBUG_INFO is true but
WITH_DEXPREOPT_DEBUG_INFO is false, system server will have mini
debug info.

Bug: 62862291
Test: make

Change-Id: I189cd144ce3ade5f02855db022874c8dd45cbdf3
parent c499e087

core/dex_preopt_odex_install.mk

+15 −0
Original line number Diff line number Diff line
@@ -201,6 +201,21 @@ ifeq (,$(filter --compiler-filter=%, $(LOCAL_DEX_PREOPT_FLAGS))) 
  endif

endif



# PRODUCT_SYSTEM_SERVER_DEBUG_INFO overrides WITH_DEXPREOPT_DEBUG_INFO.

my_system_server_debug_info := $(PRODUCT_SYSTEM_SERVER_DEBUG_INFO)

ifeq (,$(filter eng, $(TARGET_BUILD_VARIANT)))

# Only enable for non-eng builds.

ifeq (,$(my_system_server_debug_info))

my_system_server_debug_info := true

endif

endif



ifeq (true, $(my_system_server_debug_info))

  ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS),$(LOCAL_MODULE)))

    LOCAL_DEX_PREOPT_FLAGS += --generate-mini-debug-info

  endif

endif



$(built_odex): PRIVATE_DEX_PREOPT_FLAGS := $(LOCAL_DEX_PREOPT_FLAGS)

$(built_vdex): $(built_odex)

$(built_art): $(built_odex)

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ _product_var_list := \ 
    PRODUCT_VERITY_SIGNING_KEY \

    PRODUCT_SYSTEM_VERITY_PARTITION \

    PRODUCT_VENDOR_VERITY_PARTITION \

    PRODUCT_SYSTEM_SERVER_DEBUG_INFO \

    PRODUCT_DEX_PREOPT_MODULE_CONFIGS \

    PRODUCT_DEX_PREOPT_DEFAULT_FLAGS \

    PRODUCT_DEX_PREOPT_BOOT_FLAGS \

core/product_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -385,6 +385,8 @@ PRODUCT_DEX_PREOPT_PROFILE_DIR := \ 


PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_COMPILER_FILTER))

PRODUCT_SYSTEM_SERVER_DEBUG_INFO := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_DEBUG_INFO))



# Resolve and setup per-module dex-preopt configs.

PRODUCT_DEX_PREOPT_MODULE_CONFIGS := \