From 961096fadaccc38f38fb840ce621c2a1353b263c Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 6 Jan 2015 16:49:20 -0800 Subject: [PATCH] Remove ancient SDK cleanbuild rule In anceint time we didn't have an "sdk" product so that we had to run "make sdk" in a device product configuration. Now we have SDK specific product configuration and we don't do "make sdk" in device product configuration. Change-Id: I40d58d51261498017bbe7e574c8128afc77e9b96 --- core/cleanbuild.mk | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/core/cleanbuild.mk b/core/cleanbuild.mk index c820ad52f..cf980d8e0 100644 --- a/core/cleanbuild.mk +++ b/core/cleanbuild.mk @@ -132,23 +132,11 @@ endif # if not ONE_SHOT_MAKEFILE dont_bother previous_build_config_file := $(PRODUCT_OUT)/previous_build_config.mk -# TODO: this special case for the sdk is only necessary while "sdk" -# is a valid make target. Eventually, it will just be a product, at -# which point TARGET_PRODUCT will handle it and we can avoid this check -# of MAKECMDGOALS. The "addprefix" is just to keep things pretty. -ifneq ($(TARGET_PRODUCT),sdk) - building_sdk := $(addprefix -,$(filter sdk,$(MAKECMDGOALS))) -else - # Don't bother with this extra part when explicitly building the sdk product. - building_sdk := -endif - # A change in the list of aapt configs warrants an installclean, too. aapt_config_list := $(strip $(PRODUCT_AAPT_CONFIG) $(PRODUCT_AAPT_PREF_CONFIG)) current_build_config := \ - $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)$(building_sdk)-{$(aapt_config_list)} -building_sdk := + $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)-{$(aapt_config_list)} aapt_config_list := force_installclean := false