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

Fix ARMv7 -user builds

Browse Source 
Allow the dex preoptimization pass for ARMv7 system images to use the
ARMv7-specific kernel image. This is needed to fix the -user builds that
absolutely depend on running the dex preopt in the emulator.

This will hopefully be removed when we'll be able to perform the dex
preopt on the host instead.
This commit is contained in:
David 'Digit' Turner
2009-09-23 18:48:16 -07:00
parent b392641d9b
commit ef453a51f5
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/dexpreopt/Config.mk
View File

@@ -77,6 +77,13 @@ ifdef sign_dexpreopt
$(shell echo "$(p) $(PACKAGES.$(p).CERTIFICATE) $(PACKAGES.$(p).PRIVATE_KEY)" >> $(dexpreopt_package_certs_file)))
endif
# The kernel used for ARMv7 system images is different
ifeq ($(TARGET_ARCH_VARIANT),armv7-a)
BUILD_DEXPREOPT_KERNEL := prebuilt/android-arm/kernel/kernel-qemu-armv7
else
BUILD_DEXPREOPT_KERNEL := prebuilt/android-arm/kernel/kernel-qemu
endif
# Build an optimized image from the unoptimized image
BUILT_DEXPREOPT_SYSTEMIMAGE := $(intermediates)/system.img
$(BUILT_DEXPREOPT_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE_UNOPT)
@@ -99,7 +106,7 @@ $(BUILT_DEXPREOPT_SYSTEMIMAGE):
$(hide) \
PATH=$(HOST_OUT_EXECUTABLES):$$PATH \
$(DEXPREOPT) \
--kernel prebuilt/android-arm/kernel/kernel-qemu \
--kernel $(BUILD_DEXPREOPT_KERNEL) \
--ramdisk $(BUILT_DEXPREOPT_RAMDISK) \
--image $(BUILT_SYSTEMIMAGE_UNOPT) \
--system $(PRODUCT_OUT) \