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

fix broken build rules for host VM.

Browse Source
This commit is contained in:
Ryo Fujii
2011-06-16 16:58:11 -07:00
parent 856c9df4fa
commit cbb3266b47
3 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/envsetup.mk
View File

@@ -36,18 +36,6 @@ ifeq ($(strip $(TARGET_BUILD_VARIANT)),)
TARGET_BUILD_VARIANT := eng TARGET_BUILD_VARIANT := eng
endif endif
# Read the product specs so we an get TARGET_DEVICE and other
# variables that we need in order to locate the output files.
include $(BUILD_SYSTEM)/product_config.mk
build_variant := $(filter-out eng user userdebug tests,$(TARGET_BUILD_VARIANT))
ifneq ($(build_variant)-$(words $(TARGET_BUILD_VARIANT)),-1)
$(warning bad TARGET_BUILD_VARIANT: $(TARGET_BUILD_VARIANT))
$(error must be empty or one of: eng user userdebug tests)
endif
# --------------------------------------------------------------- # ---------------------------------------------------------------
# Set up configuration for host machine. We don't do cross- # Set up configuration for host machine. We don't do cross-
# compiles except for arm, so the HOST is whatever we are # compiles except for arm, so the HOST is whatever we are
@@ -119,17 +107,15 @@ else
HOST_PREBUILT_TAG := $(HOST_OS)-$(HOST_ARCH) HOST_PREBUILT_TAG := $(HOST_OS)-$(HOST_ARCH)
endif endif
# Default to building dalvikvm on hosts that support it... # Read the product specs so we an get TARGET_DEVICE and other
ifeq ($(HOST_OS),linux) # variables that we need in order to locate the output files.
# ... but not if we're building the sim... include $(BUILD_SYSTEM)/product_config.mk
ifneq ($(TARGET_SIMULATOR),true)
# ... or if the if the option is already set
ifeq ($(WITH_HOST_DALVIK),)
WITH_HOST_DALVIK := true
endif
endif
endif
build_variant := $(filter-out eng user userdebug tests,$(TARGET_BUILD_VARIANT))
ifneq ($(build_variant)-$(words $(TARGET_BUILD_VARIANT)),-1)
$(warning bad TARGET_BUILD_VARIANT: $(TARGET_BUILD_VARIANT))
$(error must be empty or one of: eng user userdebug tests)
endif
# --------------------------------------------------------------- # ---------------------------------------------------------------
# Set up configuration for target machine. # Set up configuration for target machine.

32
core/product_config.mk
View File

@@ -163,6 +163,27 @@ ifdef unbundled_goals
$(unbundled_goals): $(MAKECMDGOALS) $(unbundled_goals): $(MAKECMDGOALS)
endif # unbundled_goals endif # unbundled_goals
# ---------------------------------------------------------------
# Simulator overrides
ifeq ($(TARGET_PRODUCT),sim)
# Tell the build system to turn on some special cases
# to deal with the simulator product.
TARGET_SIMULATOR := true
# dexpreopt doesn't work when building the simulator
DISABLE_DEXPREOPT := true
endif
# Default to building dalvikvm on hosts that support it...
ifeq ($(HOST_OS),linux)
# ... but not if we're building the sim...
ifneq ($(TARGET_SIMULATOR),true)
# ... or if the if the option is already set
ifeq ($(WITH_HOST_DALVIK),)
WITH_HOST_DALVIK := true
endif
endif
endif
# --------------------------------------------------------------- # ---------------------------------------------------------------
# Include the product definitions. # Include the product definitions.
# We need to do this to translate TARGET_PRODUCT into its # We need to do this to translate TARGET_PRODUCT into its
@@ -303,14 +324,3 @@ PRODUCT_OTA_PUBLIC_KEYS := $(sort \
PRODUCT_EXTRA_RECOVERY_KEYS := $(sort \ PRODUCT_EXTRA_RECOVERY_KEYS := $(sort \
$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_EXTRA_RECOVERY_KEYS)) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_EXTRA_RECOVERY_KEYS))
# ---------------------------------------------------------------
# Simulator overrides
ifeq ($(TARGET_PRODUCT),sim)
# Tell the build system to turn on some special cases
# to deal with the simulator product.
TARGET_SIMULATOR := true
# dexpreopt doesn't work when building the simulator
DISABLE_DEXPREOPT := true
endif

1
target/product/core.mk
View File

@@ -99,6 +99,7 @@ PRODUCT_PACKAGES := \
# host-only dependencies # host-only dependencies
ifeq ($(WITH_HOST_DALVIK),true) ifeq ($(WITH_HOST_DALVIK),true)
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
apache-xml-hostdex \
bouncycastle-hostdex \ bouncycastle-hostdex \
core-hostdex \ core-hostdex \
libjavacore-host \ libjavacore-host \