tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix embedded build

Browse source 
1) Disable dexpreopt if DALVIK_VM_LIB isn't set up by the product.
2) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is moved to config.mk,
for it's only decided by target arch.
3) Move Java module input from embedded.mk to base.mk.

Change-Id: Ife70b0cd8cee2e5c92f356c808affa56f494b49a
This commit is contained in:
Ying Wang 2014-03-20 12:13:10 -07:00
parent cb902fff82
commit 8c7e74ee05
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/config.mk
View file

@ -455,6 +455,11 @@ ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)
TARGET_DEFAULT_JAVA_LIBRARIES := core core-junit ext framework framework2
endif
DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default
ifneq (,$(filter $(TARGET_CPU_VARIANT),cortex-a15 krait))
DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div
endif
# define clang/llvm tools and global flags
include $(BUILD_SYSTEM)/clang/config.mk

9
core/dex_preopt.mk
View file

@ -3,9 +3,7 @@
#
####################################
ifeq ($(DALVIK_VM_LIB),)
$(error No value for DALVIK_VM_LIB)
endif
ifneq ($(DALVIK_VM_LIB),)
# list of boot classpath jars for dexpreopt
DEXPREOPT_BOOT_JARS := $(subst $(space),:,$(PRODUCT_BOOT_JARS))
@ -70,3 +68,8 @@ endef
DEXPREOPT_ONE_FILE_DEPENDENCY_TOOLS := $(DEX2OAT_DEPENDENCY)
DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT := $(DEFAULT_DEX_PREOPT_BUILT_IMAGE)
endif
else
$(warning No DALVIK_VM_LIB, disable dexpreopt.)
WITH_DEXPREOPT := false
DISABLE_DEXPREOPT := true
endif # DALVIK_VM_LIB is defined.

5
core/dex_preopt_libart.mk
View file

@ -37,11 +37,6 @@ $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE) : $(DEFAULT_DEX_PREOPT_BUILT_IMAGE) | $(AC
$(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))
DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div
endif
# start of image reserved address space
LIBART_IMG_HOST_BASE_ADDRESS := 0x60000000

1
target/product/base.mk
View file

@ -34,6 +34,7 @@ PRODUCT_PACKAGES += \
framework2 \
fsck_msdos \
ime \
input \
javax.obex \
libandroid \
libandroid_runtime \

1
target/product/embedded.mk
View file

@ -31,7 +31,6 @@ PRODUCT_PACKAGES += \
init \
init.environ.rc \
init.rc \
input \
libEGL \
libETC1 \
libFFTEm \