diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:11:46 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 23:51:37 -0700 |
| commit | e33ba4c49ed461d608c65eb4e09d31ca81d167ff (patch) | |
| tree | 1fcc76ec2875c51aa941ebadd70e7609c0faf7c6 /core/Makefile | |
| parent | 18a298e7bc39310b844e3587345e71495a9f4bb6 (diff) | |
| download | build-e33ba4c49ed461d608c65eb4e09d31ca81d167ff.zip build-e33ba4c49ed461d608c65eb4e09d31ca81d167ff.tar.gz build-e33ba4c49ed461d608c65eb4e09d31ca81d167ff.tar.bz2 | |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/core/Makefile b/core/Makefile index 87b91bd..14de987 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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 |