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

Commit 4c93719e authored by Igor Murashkin's avatar Igor Murashkin Committed by Android (Google) Code Review
Browse files

Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files" into lmp-mr1-dev

parents be6a3db2 da9f1a7e

core/dex_preopt_libart_boot.mk

+5 −0
Original line number Diff line number Diff line
@@ -32,6 +32,11 @@ ifneq ($(PRODUCT_DEX_PREOPT_IMAGE_IN_DATA),true) 
$(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE := $(PRODUCT_OUT)$($(my_2nd_arch_prefix)LIBART_BOOT_IMAGE_FILENAME)

endif



# Compile boot.oat as position-independent code if WITH_DEXPREOPT_PIC=true

ifeq (true,$(WITH_DEXPREOPT_PIC))

  PRODUCT_DEX_PREOPT_BOOT_FLAGS += --compile-pic

endif



# The rule to install boot.art and boot.oat

$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE) : $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) | $(ACP)

	$(call copy-file-to-target)

core/dex_preopt_odex_install.mk

+6 −0
Original line number Diff line number Diff line
@@ -105,6 +105,12 @@ ifndef LOCAL_DEX_PREOPT_FLAGS 
LOCAL_DEX_PREOPT_FLAGS := $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS)

endif

endif



# Compile apps with position-independent code if WITH_DEXPREOPT_PIC=true

ifeq (true,$(WITH_DEXPREOPT_PIC))

  LOCAL_DEX_PREOPT_FLAGS += --compile-pic

endif



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



# Use pattern rule - we may have multiple installed odex files.