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

am ef453a51: Fix ARMv7 -user builds

Browse Source 
Merge commit 'ef453a51f58713bfa31c13f5e66596b3d5752049' into eclair-plus-aosp

* commit 'ef453a51f58713bfa31c13f5e66596b3d5752049':
  Fix ARMv7 -user builds
This commit is contained in:
David 'Digit' Turner
2009-09-23 21:41:07 -07:00
committed by Android Git Automerger
parent 9db1fc2bea ef453a51f5
commit d9a8e1b309
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))) $(shell echo "$(p) $(PACKAGES.$(p).CERTIFICATE) $(PACKAGES.$(p).PRIVATE_KEY)" >> $(dexpreopt_package_certs_file)))
endif 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 # Build an optimized image from the unoptimized image
BUILT_DEXPREOPT_SYSTEMIMAGE := $(intermediates)/system.img BUILT_DEXPREOPT_SYSTEMIMAGE := $(intermediates)/system.img
$(BUILT_DEXPREOPT_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE_UNOPT) $(BUILT_DEXPREOPT_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE_UNOPT)
@@ -99,7 +106,7 @@ $(BUILT_DEXPREOPT_SYSTEMIMAGE):
$(hide) \ $(hide) \
PATH=$(HOST_OUT_EXECUTABLES):$$PATH \ PATH=$(HOST_OUT_EXECUTABLES):$$PATH \
$(DEXPREOPT) \ $(DEXPREOPT) \
--kernel prebuilt/android-arm/kernel/kernel-qemu \ --kernel $(BUILD_DEXPREOPT_KERNEL) \
--ramdisk $(BUILT_DEXPREOPT_RAMDISK) \ --ramdisk $(BUILT_DEXPREOPT_RAMDISK) \
--image $(BUILT_SYSTEMIMAGE_UNOPT) \ --image $(BUILT_SYSTEMIMAGE_UNOPT) \
--system $(PRODUCT_OUT) \ --system $(PRODUCT_OUT) \