diff options
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/core/main.mk b/core/main.mk index 97d3d7e..cfca47d 100644 --- a/core/main.mk +++ b/core/main.mk @@ -37,7 +37,9 @@ endif #TOPDIR := $(TOP)/ #endif -# check for broken versions of make +# Check for broken versions of make. +# (Allow any version under Cygwin since we don't actually build the platform there.) +ifeq (,$(findstring CYGWIN,$(shell uname -sm))) ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.81)) $(warning ********************************************************************************) $(warning * You are using version $(MAKE_VERSION) of make.) @@ -46,6 +48,7 @@ $(warning * see http://source.android.com/source/download.html) $(warning ********************************************************************************) $(error stopping) endif +endif TOP := . TOPDIR := @@ -271,11 +274,13 @@ endif # !enable_target_debugging ifeq ($(TARGET_BUILD_VARIANT),eng) tags_to_install := user debug eng +ifneq ($(filter ro.setupwizard.mode=ENABLED, $(call collapse-pairs, $(ADDITIONAL_BUILD_PROPERTIES))),) # Don't require the setup wizard on eng builds ADDITIONAL_BUILD_PROPERTIES := $(filter-out ro.setupwizard.mode=%,\ $(call collapse-pairs, $(ADDITIONAL_BUILD_PROPERTIES))) \ ro.setupwizard.mode=OPTIONAL endif +endif ## tests ## @@ -395,6 +400,7 @@ ifeq ($(SDK_ONLY),true) subdirs := \ prebuilt \ + prebuilts \ build/libs/host \ build/tools/zipalign \ dalvik/dexdump \ @@ -441,6 +447,7 @@ subdirs += \ sdk/ide_common \ sdk/jarutils \ sdk/layoutlib_api \ + sdk/manifmerger \ sdk/ninepatch \ sdk/rule_api \ sdk/lint \ @@ -727,6 +734,9 @@ checkbuild: $(modules_to_check) .PHONY: ramdisk ramdisk: $(INSTALLED_RAMDISK_TARGET) +.PHONY: factory_ramdisk +factory_ramdisk: $(INSTALLED_FACTORY_RAMDISK_TARGET) + .PHONY: systemtarball systemtarball: $(INSTALLED_SYSTEMTARBALL_TARGET) @@ -807,6 +817,7 @@ else # TARGET_BUILD_APPS $(BUILT_TARGET_FILES_PACKAGE) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) \ $(INSTALLED_RAMDISK_TARGET) \ + $(INSTALLED_FACTORY_RAMDISK_TARGET) \ ) # Building a full system-- the default is to build droidcore |