merge from open-source master

Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623
This commit is contained in:
The Android Open Source Project
2010-05-03 16:11:04 -07:00
9 changed files with 330 additions and 2 deletions

View File

@@ -35,7 +35,7 @@ ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") \>= 3.81))
$(warning ********************************************************************************)
$(warning * You are using version $(MAKE_VERSION) of make.)
$(warning * You must upgrade to version 3.81 or greater.)
$(warning * see file://$(shell pwd)/docs/development-environment/machine-setup.html)
$(warning * see http://source.android.com/download)
$(warning ********************************************************************************)
$(error stopping)
endif