Remove the simulator target from all makefiles.
Bug: 5010576 Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
This commit is contained in:
Jeff Brown
parent
18a298e7bc
commit
e33ba4c49e
18 changed files with 46 additions and 288 deletions
|
|
@ -45,16 +45,9 @@ ifndef CUSTOM_MODULES
|
|||
#CUSTOM_MODULES:=
|
||||
endif
|
||||
|
||||
# Uncomment this if you want the simulator, otherwise, build for arm
|
||||
ifndef TARGET_SIMULATOR
|
||||
#TARGET_SIMULATOR:=true
|
||||
endif
|
||||
|
||||
# Set this to debug or release if you care. Otherwise, it defaults to
|
||||
# release for arm and debug for the simulator.
|
||||
# Set this to debug or release if you care. Otherwise, it defaults to release.
|
||||
ifndef TARGET_BUILD_TYPE
|
||||
#TARGET_BUILD_TYPE:=release
|
||||
#TARGET_BUILD_TYPE:=debug
|
||||
endif
|
||||
|
||||
# Uncomment this if you want the host tools built in debug mode. Otherwise
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ endif
|
|||
DEFAULT_KEY_CERT_PAIR := $(SRC_TARGET_DIR)/product/security/testkey
|
||||
|
||||
|
||||
# Rules that need to be present for the simulator, even
|
||||
# Rules that need to be present for the all targets, even
|
||||
# if they don't do anything.
|
||||
.PHONY: systemimage
|
||||
systemimage:
|
||||
|
|
@ -313,8 +313,6 @@ event-log-tags: $(event_log_tags_file)
|
|||
ALL_DEFAULT_INSTALLED_MODULES += $(event_log_tags_file)
|
||||
|
||||
|
||||
ifneq ($(TARGET_SIMULATOR),true)
|
||||
|
||||
# #################################################################
|
||||
# Targets for boot/OS images
|
||||
# #################################################################
|
||||
|
|
@ -1088,7 +1086,6 @@ endif
|
|||
target-files-package: $(BUILT_TARGET_FILES_PACKAGE)
|
||||
|
||||
|
||||
ifneq ($(TARGET_SIMULATOR),true)
|
||||
ifneq ($(TARGET_PRODUCT),sdk)
|
||||
ifeq ($(filter generic%,$(TARGET_DEVICE)),)
|
||||
ifneq ($(TARGET_NO_KERNEL),true)
|
||||
|
|
@ -1149,7 +1146,6 @@ endif # recovery_fstab is defined
|
|||
endif # TARGET_NO_KERNEL != true
|
||||
endif # TARGET_DEVICE != generic*
|
||||
endif # TARGET_PRODUCT != sdk
|
||||
endif # TARGET_SIMULATOR != true
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
# installed file list
|
||||
|
|
@ -1269,8 +1265,6 @@ $(EMMA_META_ZIP): $(INSTALLED_SYSTEMIMAGE)
|
|||
$(hide) find $(TARGET_COMMON_OUT_ROOT) -name "coverage.em" | \
|
||||
zip -@ -q $@
|
||||
|
||||
endif # TARGET_SIMULATOR != true
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
# dalvik something
|
||||
.PHONY: dalvikfiles
|
||||
|
|
@ -1279,8 +1273,6 @@ dalvikfiles: $(INTERNAL_DALVIK_MODULES)
|
|||
# -----------------------------------------------------------------
|
||||
# The emulator package
|
||||
|
||||
ifneq ($(TARGET_SIMULATOR),true)
|
||||
|
||||
INTERNAL_EMULATOR_PACKAGE_FILES += \
|
||||
$(HOST_OUT_EXECUTABLES)/emulator$(HOST_EXECUTABLE_SUFFIX) \
|
||||
prebuilt/android-$(TARGET_ARCH)/kernel/kernel-qemu \
|
||||
|
|
@ -1296,8 +1288,6 @@ $(INTERNAL_EMULATOR_PACKAGE_TARGET): $(INTERNAL_EMULATOR_PACKAGE_FILES)
|
|||
@echo "Package: $@"
|
||||
$(hide) zip -qj $@ $(INTERNAL_EMULATOR_PACKAGE_FILES)
|
||||
|
||||
endif
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
# The pdk package (Platform Development Kit)
|
||||
|
||||
|
|
@ -1308,8 +1298,6 @@ endif
|
|||
# -----------------------------------------------------------------
|
||||
# The SDK
|
||||
|
||||
ifneq ($(TARGET_SIMULATOR),true)
|
||||
|
||||
# The SDK includes host-specific components, so it belongs under HOST_OUT.
|
||||
sdk_dir := $(HOST_OUT)/sdk
|
||||
|
||||
|
|
@ -1452,8 +1440,6 @@ ifneq ($(filter win_sdk,$(MAKECMDGOALS)),)
|
|||
include $(TOPDIR)development/build/tools/windows_sdk.mk
|
||||
endif
|
||||
|
||||
endif # !simulator
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
# Findbugs
|
||||
INTERNAL_FINDBUGS_XML_TARGET := $(PRODUCT_OUT)/findbugs.xml
|
||||
|
|
|
|||
|
|
@ -9,10 +9,6 @@
|
|||
## Sanity check for LOCAL_NDK_VERSION
|
||||
######################################
|
||||
my_ndk_version_root :=
|
||||
ifeq ($(TARGET_SIMULATOR),true)
|
||||
# NDK does not support sim build.
|
||||
LOCAL_NDK_VERSION :=
|
||||
endif
|
||||
ifdef LOCAL_NDK_VERSION
|
||||
ifdef LOCAL_IS_HOST_MODULE
|
||||
$(error $(LOCAL_PATH): LOCAL_NDK_VERSION can not be used in host module)
|
||||
|
|
@ -272,7 +268,7 @@ endif
|
|||
## C++: Compile .cpp files to .o.
|
||||
###########################################################
|
||||
|
||||
# we also do this on host modules and sim builds, even though
|
||||
# we also do this on host modules, even though
|
||||
# it's not really arm, because there are files that are shared.
|
||||
cpp_arm_sources := $(patsubst %$(LOCAL_CPP_EXTENSION).arm,%$(LOCAL_CPP_EXTENSION),$(filter %$(LOCAL_CPP_EXTENSION).arm,$(LOCAL_SRC_FILES)))
|
||||
cpp_arm_objects := $(addprefix $(intermediates)/,$(cpp_arm_sources:$(LOCAL_CPP_EXTENSION)=.o))
|
||||
|
|
|
|||
|
|
@ -516,16 +516,8 @@ specified here as well.</p>
|
|||
</tr>
|
||||
</table>
|
||||
|
||||
<h4>TARGET_SIMULATOR</h4>
|
||||
<p>If we're building the simulator, as opposed to the arm or emulator builds,
|
||||
<code>TARGET_SIMULATOR</code> will be set to <code>true</code>.
|
||||
|
||||
<h4>Some Examples</h4>
|
||||
<pre>ifeq ($(TARGET_SIMULATOR),true)
|
||||
LOCAL_CFLAGS += -DSIMULATOR
|
||||
endif
|
||||
|
||||
ifeq ($(TARGET_BUILD_TYPE),release)
|
||||
<pre>ifeq ($(TARGET_BUILD_TYPE),release)
|
||||
LOCAL_CFLAGS += -DNDEBUG=1
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -45,13 +45,8 @@ endif # TARGET_PRODUCT == sdk
|
|||
# We build everything in 32-bit, because some host tools are
|
||||
# 32-bit-only anyway (emulator, acc), and because it gives us
|
||||
# more consistency between the host tools and the target.
|
||||
# The exception is the host side of the simulator, which
|
||||
# requires to use the default size, as wxWidgets code otherwise
|
||||
# fails to build.
|
||||
ifneq ($(TARGET_SIMULATOR),true)
|
||||
HOST_GLOBAL_CFLAGS += -m32
|
||||
HOST_GLOBAL_LDFLAGS += -m32
|
||||
endif
|
||||
|
||||
HOST_GLOBAL_CFLAGS += -fPIC
|
||||
HOST_GLOBAL_CFLAGS += \
|
||||
|
|
|
|||
|
|
@ -17,19 +17,6 @@
|
|||
# Configuration for Linux on x86 as a target.
|
||||
# Included by combo/select.mk
|
||||
|
||||
ifeq ($(TARGET_SIMULATOR),true)
|
||||
# When building for the simulator, use the HOST settings as TARGET settings
|
||||
TARGET_CC := $(HOST_CC)
|
||||
TARGET_CXX := $(HOST_CXX)
|
||||
TARGET_AR := $(HOST_AR)
|
||||
TARGET_GLOBAL_CFLAGS := $(HOST_GLOBAL_CFLAGS) -m32
|
||||
TARGET_GLOBAL_LDFLAGS := $(HOST_GLOBAL_LDFLAGS) -m32 -lpthread
|
||||
TARGET_NO_UNDEFINED_LDFLAGS := $(HOST_NO_UNDEFINED_LDFLAGS)
|
||||
ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
|
||||
TARGET_ARCH_VARIANT := x86
|
||||
endif
|
||||
else #simulator
|
||||
|
||||
# Provide a default variant.
|
||||
ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
|
||||
TARGET_ARCH_VARIANT := x86
|
||||
|
|
@ -204,5 +191,3 @@ $(hide) $(PRIVATE_CXX) \
|
|||
-Wl,--end-group \
|
||||
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O))
|
||||
endef
|
||||
|
||||
endif #simulator
|
||||
|
|
|
|||
|
|
@ -317,13 +317,9 @@ TARGET_PROJECT_INCLUDES:= $(SRC_HEADERS) $(TARGET_OUT_HEADERS)
|
|||
|
||||
# Many host compilers don't support these flags, so we have to make
|
||||
# sure to only specify them for the target compilers checked in to
|
||||
# the source tree. The simulator passes the target flags to the
|
||||
# host compiler, so only set them for the target when the target
|
||||
# is not the simulator.
|
||||
ifneq ($(TARGET_SIMULATOR),true)
|
||||
# the source tree.
|
||||
TARGET_GLOBAL_CFLAGS += $(TARGET_ERROR_FLAGS)
|
||||
TARGET_GLOBAL_CPPFLAGS += $(TARGET_ERROR_FLAGS)
|
||||
endif
|
||||
|
||||
HOST_GLOBAL_CFLAGS += $(HOST_RELEASE_CFLAGS)
|
||||
HOST_GLOBAL_CPPFLAGS += $(HOST_RELEASE_CPPFLAGS)
|
||||
|
|
@ -369,10 +365,6 @@ INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/publi
|
|||
|
||||
# This is the standard way to name a directory containing prebuilt target
|
||||
# objects. E.g., prebuilt/$(TARGET_PREBUILT_TAG)/libc.so
|
||||
ifeq ($(TARGET_SIMULATOR),true)
|
||||
TARGET_PREBUILT_TAG := $(TARGET_OS)-$(TARGET_ARCH)
|
||||
else
|
||||
TARGET_PREBUILT_TAG := android-$(TARGET_ARCH)
|
||||
endif
|
||||
TARGET_PREBUILT_TAG := android-$(TARGET_ARCH)
|
||||
|
||||
include $(BUILD_SYSTEM)/dumpvar.mk
|
||||
|
|
|
|||
|
|
@ -5,14 +5,10 @@ ifeq ($(CALLED_FROM_SETUP),true)
|
|||
|
||||
ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES)
|
||||
|
||||
ifeq ($(TARGET_SIMULATOR),true)
|
||||
ABP:=$(ABP):$(TARGET_OUT_EXECUTABLES)
|
||||
else
|
||||
# Add the toolchain bin dir if it actually exists
|
||||
ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin),)
|
||||
# this should be copied to HOST_OUT_EXECUTABLES instead
|
||||
ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin
|
||||
endif
|
||||
# Add the toolchain bin dir if it actually exists
|
||||
ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin),)
|
||||
# this should be copied to HOST_OUT_EXECUTABLES instead
|
||||
ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin
|
||||
endif
|
||||
ANDROID_BUILD_PATHS := $(ABP)
|
||||
ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG)
|
||||
|
|
@ -68,7 +64,6 @@ $(info PLATFORM_VERSION_CODENAME=$(PLATFORM_VERSION_CODENAME))
|
|||
$(info PLATFORM_VERSION=$(PLATFORM_VERSION))
|
||||
$(info TARGET_PRODUCT=$(TARGET_PRODUCT))
|
||||
$(info TARGET_BUILD_VARIANT=$(TARGET_BUILD_VARIANT))
|
||||
$(info TARGET_SIMULATOR=$(TARGET_SIMULATOR))
|
||||
$(info TARGET_BUILD_TYPE=$(TARGET_BUILD_TYPE))
|
||||
$(info TARGET_BUILD_APPS=$(TARGET_BUILD_APPS))
|
||||
$(info TARGET_ARCH=$(TARGET_ARCH))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
# Variables we check:
|
||||
# HOST_BUILD_TYPE = { release debug }
|
||||
# TARGET_SIMULATOR = { true <null> }
|
||||
# TARGET_BUILD_TYPE = { release debug }
|
||||
# and we output a bunch of variables, see the case statement at
|
||||
# the bottom for the full list
|
||||
|
|
@ -19,16 +18,12 @@ include $(BUILD_SYSTEM)/version_defaults.mk
|
|||
CORRECT_BUILD_ENV_SEQUENCE_NUMBER := 10
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# The product defaults to generic on hardware and sim on sim
|
||||
# The product defaults to generic on hardware
|
||||
# NOTE: This will be overridden in product_config.mk if make
|
||||
# was invoked with a PRODUCT-xxx-yyy goal.
|
||||
ifeq ($(TARGET_PRODUCT),)
|
||||
ifeq ($(TARGET_SIMULATOR),true)
|
||||
TARGET_PRODUCT := sim
|
||||
else
|
||||
TARGET_PRODUCT := full
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
# the variant -- the set of files that are included for a build
|
||||
|
|
@ -124,20 +119,10 @@ endif
|
|||
# TARGET_ARCH = { arm | x86 }
|
||||
|
||||
|
||||
# if we're build the simulator, HOST_* is TARGET_* (except for BUILD_TYPE)
|
||||
# otherwise it's <arch>-linux
|
||||
ifeq ($(TARGET_SIMULATOR),true)
|
||||
ifneq ($(HOST_OS),linux)
|
||||
$(error TARGET_SIMULATOR=true is only supported under Linux)
|
||||
endif
|
||||
TARGET_ARCH := $(HOST_ARCH)
|
||||
TARGET_OS := $(HOST_OS)
|
||||
else
|
||||
ifeq ($(TARGET_ARCH),)
|
||||
TARGET_ARCH := arm
|
||||
endif
|
||||
TARGET_OS := linux
|
||||
endif
|
||||
|
||||
# the target build type defaults to release
|
||||
ifneq ($(TARGET_BUILD_TYPE),debug)
|
||||
|
|
@ -169,15 +154,7 @@ HOST_OUT := $(HOST_OUT_$(HOST_BUILD_TYPE))
|
|||
|
||||
BUILD_OUT := $(OUT_DIR)/host/$(BUILD_OS)-$(BUILD_ARCH)
|
||||
|
||||
ifeq ($(TARGET_SIMULATOR),true)
|
||||
# Any arch- or os-specific parts of the simulator (everything
|
||||
# under product/) are actually host-dependent.
|
||||
# But, the debug type is controlled by TARGET_BUILD_TYPE and not
|
||||
# HOST_BUILD_TYPE.
|
||||
TARGET_PRODUCT_OUT_ROOT := $(HOST_OUT_$(TARGET_BUILD_TYPE))/pr
|
||||
else
|
||||
TARGET_PRODUCT_OUT_ROOT := $(TARGET_OUT_ROOT)/product
|
||||
endif
|
||||
TARGET_PRODUCT_OUT_ROOT := $(TARGET_OUT_ROOT)/product
|
||||
|
||||
TARGET_COMMON_OUT_ROOT := $(TARGET_OUT_ROOT)/common
|
||||
HOST_COMMON_OUT_ROOT := $(HOST_OUT_ROOT)/common
|
||||
|
|
|
|||
|
|
@ -163,26 +163,13 @@ ifdef unbundled_goals
|
|||
$(unbundled_goals): $(MAKECMDGOALS)
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -476,7 +476,6 @@ GRANDFATHERED_USER_MODULES += \
|
|||
signapk \
|
||||
signature-tools \
|
||||
simg2img \
|
||||
simulator \
|
||||
spec-progress \
|
||||
sqlite3 \
|
||||
stack_dump \
|
||||
|
|
|
|||
162
envsetup.sh
162
envsetup.sh
|
|
@ -54,8 +54,9 @@ function check_product()
|
|||
return
|
||||
fi
|
||||
CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core \
|
||||
TARGET_PRODUCT=$1 TARGET_BUILD_VARIANT= \
|
||||
TARGET_SIMULATOR= TARGET_BUILD_TYPE= \
|
||||
TARGET_PRODUCT=$1 \
|
||||
TARGET_BUILD_VARIANT= \
|
||||
TARGET_BUILD_TYPE= \
|
||||
TARGET_BUILD_APPS= \
|
||||
get_build_var TARGET_DEVICE > /dev/null
|
||||
# hide successful answers, but allow the errors to show
|
||||
|
|
@ -189,74 +190,6 @@ function settitle()
|
|||
fi
|
||||
}
|
||||
|
||||
case `uname -s` in
|
||||
Linux)
|
||||
function choosesim()
|
||||
{
|
||||
echo "Build for the simulator or the device?"
|
||||
echo " 1. Device"
|
||||
echo " 2. Simulator"
|
||||
echo
|
||||
|
||||
export TARGET_SIMULATOR=
|
||||
local ANSWER
|
||||
while [ -z $TARGET_SIMULATOR ]
|
||||
do
|
||||
echo -n "Which would you like? [1] "
|
||||
if [ -z "$1" ] ; then
|
||||
read ANSWER
|
||||
else
|
||||
echo $1
|
||||
ANSWER=$1
|
||||
fi
|
||||
case $ANSWER in
|
||||
"")
|
||||
export TARGET_SIMULATOR=false
|
||||
;;
|
||||
1)
|
||||
export TARGET_SIMULATOR=false
|
||||
;;
|
||||
Device)
|
||||
export TARGET_SIMULATOR=false
|
||||
;;
|
||||
2)
|
||||
export TARGET_SIMULATOR=true
|
||||
;;
|
||||
Simulator)
|
||||
export TARGET_SIMULATOR=true
|
||||
;;
|
||||
*)
|
||||
echo
|
||||
echo "I didn't understand your response. Please try again."
|
||||
echo
|
||||
;;
|
||||
esac
|
||||
if [ -n "$1" ] ; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
set_stuff_for_environment
|
||||
}
|
||||
;;
|
||||
*)
|
||||
function choosesim()
|
||||
{
|
||||
echo "Only device builds are supported for" `uname -s`
|
||||
echo " Forcing TARGET_SIMULATOR=false"
|
||||
echo
|
||||
if [ -z "$1" ]
|
||||
then
|
||||
echo -n "Press enter: "
|
||||
read
|
||||
fi
|
||||
|
||||
export TARGET_SIMULATOR=false
|
||||
set_stuff_for_environment
|
||||
}
|
||||
;;
|
||||
esac
|
||||
|
||||
function choosetype()
|
||||
{
|
||||
echo "Build type choices are:"
|
||||
|
|
@ -265,13 +198,8 @@ function choosetype()
|
|||
echo
|
||||
|
||||
local DEFAULT_NUM DEFAULT_VALUE
|
||||
if [ $TARGET_SIMULATOR = "false" ] ; then
|
||||
DEFAULT_NUM=1
|
||||
DEFAULT_VALUE=release
|
||||
else
|
||||
DEFAULT_NUM=2
|
||||
DEFAULT_VALUE=debug
|
||||
fi
|
||||
DEFAULT_NUM=1
|
||||
DEFAULT_VALUE=release
|
||||
|
||||
export TARGET_BUILD_TYPE=
|
||||
local ANSWER
|
||||
|
|
@ -325,11 +253,7 @@ function chooseproduct()
|
|||
if [ "x$TARGET_PRODUCT" != x ] ; then
|
||||
default_value=$TARGET_PRODUCT
|
||||
else
|
||||
if [ "$TARGET_SIMULATOR" = true ] ; then
|
||||
default_value=sim
|
||||
else
|
||||
default_value=full
|
||||
fi
|
||||
default_value=full
|
||||
fi
|
||||
|
||||
export TARGET_PRODUCT=
|
||||
|
|
@ -411,19 +335,15 @@ function choosevariant()
|
|||
|
||||
function choosecombo()
|
||||
{
|
||||
choosesim $1
|
||||
choosetype $1
|
||||
|
||||
echo
|
||||
echo
|
||||
choosetype $2
|
||||
chooseproduct $2
|
||||
|
||||
echo
|
||||
echo
|
||||
chooseproduct $3
|
||||
|
||||
echo
|
||||
echo
|
||||
choosevariant $4
|
||||
choosevariant $3
|
||||
|
||||
echo
|
||||
set_stuff_for_environment
|
||||
|
|
@ -486,9 +406,6 @@ function lunch()
|
|||
if [ -z "$answer" ]
|
||||
then
|
||||
selection=full-eng
|
||||
elif [ "$answer" = "simulator" ]
|
||||
then
|
||||
selection=simulator
|
||||
elif (echo -n $answer | grep -q -e "^[0-9][0-9]*$")
|
||||
then
|
||||
if [ $answer -le ${#LUNCH_MENU_CHOICES[@]} ]
|
||||
|
|
@ -509,45 +426,35 @@ function lunch()
|
|||
|
||||
export TARGET_BUILD_APPS=
|
||||
|
||||
# special case the simulator
|
||||
if [ "$selection" = "simulator" ]
|
||||
local product=$(echo -n $selection | sed -e "s/-.*$//")
|
||||
check_product $product
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
export TARGET_PRODUCT=sim
|
||||
export TARGET_BUILD_VARIANT=eng
|
||||
export TARGET_SIMULATOR=true
|
||||
export TARGET_BUILD_TYPE=debug
|
||||
else
|
||||
local product=$(echo -n $selection | sed -e "s/-.*$//")
|
||||
check_product $product
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
echo
|
||||
echo "** Don't have a product spec for: '$product'"
|
||||
echo "** Do you have the right repo manifest?"
|
||||
product=
|
||||
fi
|
||||
echo
|
||||
echo "** Don't have a product spec for: '$product'"
|
||||
echo "** Do you have the right repo manifest?"
|
||||
product=
|
||||
fi
|
||||
|
||||
local variant=$(echo -n $selection | sed -e "s/^[^\-]*-//")
|
||||
check_variant $variant
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
echo
|
||||
echo "** Invalid variant: '$variant'"
|
||||
echo "** Must be one of ${VARIANT_CHOICES[@]}"
|
||||
variant=
|
||||
fi
|
||||
local variant=$(echo -n $selection | sed -e "s/^[^\-]*-//")
|
||||
check_variant $variant
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
echo
|
||||
echo "** Invalid variant: '$variant'"
|
||||
echo "** Must be one of ${VARIANT_CHOICES[@]}"
|
||||
variant=
|
||||
fi
|
||||
|
||||
if [ -z "$product" -o -z "$variant" ]
|
||||
then
|
||||
echo
|
||||
return 1
|
||||
fi
|
||||
if [ -z "$product" -o -z "$variant" ]
|
||||
then
|
||||
echo
|
||||
return 1
|
||||
fi
|
||||
|
||||
export TARGET_PRODUCT=$product
|
||||
export TARGET_BUILD_VARIANT=$variant
|
||||
export TARGET_SIMULATOR=false
|
||||
export TARGET_BUILD_TYPE=release
|
||||
fi # !simulator
|
||||
export TARGET_PRODUCT=$product
|
||||
export TARGET_BUILD_VARIANT=$variant
|
||||
export TARGET_BUILD_TYPE=release
|
||||
|
||||
echo
|
||||
|
||||
|
|
@ -588,7 +495,6 @@ function tapas()
|
|||
|
||||
export TARGET_PRODUCT=full
|
||||
export TARGET_BUILD_VARIANT=$variant
|
||||
export TARGET_SIMULATOR=false
|
||||
export TARGET_BUILD_TYPE=release
|
||||
export TARGET_BUILD_APPS=$apps
|
||||
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
# config.mk
|
||||
#
|
||||
# Product-specific compile-time definitions.
|
||||
#
|
||||
|
||||
# Don't try compressing the shared libraries used by the simulator. The host
|
||||
# OS won't know what to do with them, and they may not even be ELF files.
|
||||
#
|
||||
# These definitions override the defaults in config/config.make.
|
||||
TARGET_COMPRESS_MODULE_SYMBOLS := false
|
||||
|
||||
# Don't try to build a bootloader.
|
||||
TARGET_NO_BOOTLOADER := true
|
||||
|
||||
# Don't bother with a kernel
|
||||
TARGET_NO_KERNEL := true
|
||||
|
||||
# The simulator does not support native code at all
|
||||
TARGET_CPU_ABI := none
|
||||
|
||||
# But it is very likely SMP.
|
||||
TARGET_CPU_SMP := true
|
||||
|
||||
#the simulator partially emulates the original HTC /dev/eac audio interface
|
||||
HAVE_HTC_AUDIO_DRIVER := true
|
||||
BOARD_USES_GENERIC_AUDIO := true
|
||||
|
||||
# no hardware camera
|
||||
USE_CAMERA_STUB := true
|
||||
|
|
@ -41,6 +41,5 @@ PRODUCT_MAKEFILES := \
|
|||
$(LOCAL_DIR)/vbox_x86.mk \
|
||||
$(LOCAL_DIR)/sdk.mk \
|
||||
$(LOCAL_DIR)/sdk_x86.mk \
|
||||
$(LOCAL_DIR)/sim.mk \
|
||||
$(LOCAL_DIR)/large_emu_hw.mk
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/locales_full.mk)
|
||||
|
||||
# Overrides
|
||||
PRODUCT_NAME := sim
|
||||
PRODUCT_DEVICE := sim
|
||||
|
|
@ -15,8 +15,6 @@
|
|||
LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
ifneq ($(TARGET_SIMULATOR),true)
|
||||
|
||||
LOCAL_SRC_FILES := check_prereq.c
|
||||
LOCAL_MODULE := check_prereq
|
||||
LOCAL_FORCE_STATIC_EXECUTABLE := true
|
||||
|
|
@ -25,6 +23,3 @@ LOCAL_C_INCLUDES +=
|
|||
LOCAL_STATIC_LIBRARIES += libcutils libc
|
||||
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
||||
endif # !TARGET_SIMULATOR
|
||||
|
||||
|
|
|
|||
|
|
@ -15,13 +15,9 @@
|
|||
LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
ifneq ($(TARGET_SIMULATOR),true)
|
||||
|
||||
LOCAL_SRC_FILES := fs_config.c
|
||||
LOCAL_MODULE := fs_config
|
||||
LOCAL_FORCE_STATIC_EXECUTABLE := true
|
||||
LOCAL_MODULE_TAGS := eng
|
||||
|
||||
include $(BUILD_HOST_EXECUTABLE)
|
||||
|
||||
endif # !TARGET_SIMULATOR
|
||||
|
|
|
|||
Loading…
Reference in a new issue