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

Commit 2e81b3c4 authored by Przemyslaw Szczepaniak's avatar Przemyslaw Szczepaniak
Browse files

Enable stripping of java debug information when required. 

We're removing LocalVariableType / LocalVariableType in order to
save space. Enabling stripping reduces AOSP  image size save
by ~12MB.

Bug: 38224820
Test: CtsLibcoreTestCases
Change-Id: I3168d73ec6825aa5879db7e1135d7ed61d488d72
parent b519d002

core/java.mk

+10 −0
Original line number Diff line number Diff line
@@ -425,6 +425,16 @@ ifeq ($(RUN_ERROR_PRONE),true) 
LOCAL_JAVACFLAGS += $(LOCAL_ERROR_PRONE_FLAGS)

endif



# For user / userdebug builds, strip the local variable table and the local variable

# type table. This has no bearing on stack traces, but will leave less information

# available via JDWP.

ifneq (,$(PRODUCT_MINIMIZE_JAVA_DEBUG_INFO))

ifneq (,$(filter userdebug user,$(TARGET_BUILD_VARIANT)))

LOCAL_JAVACFLAGS+= -g:source,lines

LOCAL_JACK_FLAGS+= -D jack.dex.debug.vars=false -D jack.dex.debug.vars.synthetic=false

endif

endif



$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JAVACFLAGS) $(annotation_processor_flags)

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(LOCAL_JAR_EXCLUDE_FILES)

$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES := $(LOCAL_JAR_PACKAGES)

core/product.mk

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

    PRODUCT_IOT \

    PRODUCT_SYSTEM_HEADROOM \

    PRODUCT_MINIMIZE_JAVA_DEBUG_INFO \

core/product_config.mk

+4 −0
Original line number Diff line number Diff line
@@ -423,3 +423,7 @@ PRODUCT_ENFORCE_RRO_TARGETS := \ 
# Add reserved headroom to a system image.

PRODUCT_SYSTEM_HEADROOM := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_HEADROOM))



# Whether to save disk space by minimizing java debug info

PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_MINIMIZE_JAVA_DEBUG_INFO))