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

Commit c5151cf0 authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

resolved conflicts for merge of 1737b1ab to master 

Change-Id: I5a5f2e83c5155c1c783711f736c60198a8f404ee
parents ed9f6bb3 1737b1ab

core/dex_preopt_libart.mk

+4 −0
Original line number Diff line number Diff line
@@ -26,12 +26,16 @@ PRELOADED_CLASSES := frameworks/base/preloaded-classes 
LIBART_BOOT_IMAGE := /$(DEXPREOPT_BOOT_JAR_DIR)/boot.art



DEFAULT_DEX_PREOPT_BUILT_IMAGE := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot.art



DEFAULT_DEX_PREOPT_INSTALLED_IMAGE :=

ifneq ($(PRODUCT_DEX_PREOPT_IMAGE_IN_DATA),true)

DEFAULT_DEX_PREOPT_INSTALLED_IMAGE := $(PRODUCT_OUT)$(LIBART_BOOT_IMAGE)



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

$(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE) : $(DEFAULT_DEX_PREOPT_BUILT_IMAGE) | $(ACP)

	$(call copy-file-to-target)

	$(hide) $(ACP) -fp $(patsubst %.art,%.oat,$<) $(patsubst %.art,%.oat,$@)

endif



DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default

ifeq ($(TARGET_CPU_VARIANT),$(filter $(TARGET_CPU_VARIANT),cortex-a15 krait))

core/product.mk

+2 −2
Original line number Diff line number Diff line
@@ -98,11 +98,11 @@ _product_var_list := \ 
    PRODUCT_FACTORY_BUNDLE_MODULES \

    PRODUCT_RUNTIMES \

    PRODUCT_BOOT_JARS \

    PRODUCT_DEX_PREOPT_IMAGE_IN_DATA \

    PRODUCT_SUPPORTS_VERITY \

    PRODUCT_VERITY_PARTITION \

    PRODUCT_VERITY_SIGNING_KEY





define dump-product

$(info ==== $(1) ====)\

$(foreach v,$(_product_var_list),\
@@ -258,7 +258,7 @@ _product_stash_var_list += \ 
	DEFAULT_SYSTEM_DEV_CERTIFICATE



#

# Stash vaues of the variables in _product_stash_var_list.

# Stash values of the variables in _product_stash_var_list.

# $(1): Renamed prefix

#

define stash-product-vars

core/product_config.mk

+4 −0
Original line number Diff line number Diff line
@@ -404,3 +404,7 @@ PRODUCT_OTA_PUBLIC_KEYS := $(sort \ 


PRODUCT_EXTRA_RECOVERY_KEYS := $(sort \

    $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_EXTRA_RECOVERY_KEYS))



# If there is no room in /system for the image, place it in /data

PRODUCT_DEX_PREOPT_IMAGE_IN_DATA := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_IMAGE_IN_DATA))