StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 44259e4c: Merge "Build: Support for compiled-classes file"

Browse Source 
* commit '44259e4cc64bd0382fb27f6d7540c7494db198cc':
  Build: Support for compiled-classes file
This commit is contained in:
Andreas Gampe
2014-11-18 23:39:07 +00:00
committed by Android Git Automerger
parent c9669d9e09 44259e4cc6
commit 41c939a186
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/dex_preopt_libart.mk
View File

@@ -20,6 +20,10 @@ DEX2OATD_DEPENDENCY += $(DEX2OATD)
PRELOADED_CLASSES := $(call word-colon,1,$(firstword \ PRELOADED_CLASSES := $(call word-colon,1,$(firstword \
$(filter %system/etc/preloaded-classes,$(PRODUCT_COPY_FILES)))) $(filter %system/etc/preloaded-classes,$(PRODUCT_COPY_FILES))))
# Use the first compiled-classes file in PRODUCT_COPY_FILES.
COMPILED_CLASSES := $(call word-colon,1,$(firstword \
$(filter %system/etc/compiled-classes,$(PRODUCT_COPY_FILES))))
# Default to debug version to help find bugs. # Default to debug version to help find bugs.
# Set USE_DEX2OAT_DEBUG to false for only building non-debug versions. # Set USE_DEX2OAT_DEBUG to false for only building non-debug versions.
ifneq ($(USE_DEX2OAT_DEBUG), false) ifneq ($(USE_DEX2OAT_DEBUG), false)

8
core/dex_preopt_libart_boot.mk
View File

@@ -37,6 +37,12 @@ ifeq (true,$(WITH_DEXPREOPT_PIC))
PRODUCT_DEX_PREOPT_BOOT_FLAGS += --compile-pic PRODUCT_DEX_PREOPT_BOOT_FLAGS += --compile-pic
endif endif
# If we have a compiled-classes file, create a parameter.
COMPILED_CLASSES_FLAGS :=
ifneq ($(COMPILED_CLASSES),)
COMPILED_CLASSES_FLAGS := --compiled-classes=$(COMPILED_CLASSES)
endif
# The rule to install boot.art and boot.oat # 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) $($(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) $(call copy-file-to-target)
@@ -60,4 +66,4 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE
--instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \ --instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \
--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \ --instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \
--android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate --no-include-debug-symbols \ --android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate --no-include-debug-symbols \
$(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(COMPILED_CLASSES_FLAGS)

5
target/product/base.mk
View File

@@ -118,5 +118,10 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES := $(call add-to-product-copy-files-if-exists,\ PRODUCT_COPY_FILES := $(call add-to-product-copy-files-if-exists,\
frameworks/base/preloaded-classes:system/etc/preloaded-classes) frameworks/base/preloaded-classes:system/etc/preloaded-classes)
# Note: it is acceptable to not have a compiled-classes file. In that case, all boot classpath
# classes will be compiled.
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
frameworks/base/compiled-classes:system/etc/compiled-classes)
$(call inherit-product, $(SRC_TARGET_DIR)/product/embedded.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/embedded.mk)