diff options
| -rw-r--r-- | core/Makefile | 1 | ||||
| -rw-r--r-- | core/main.mk | 48 |
2 files changed, 29 insertions, 20 deletions
diff --git a/core/Makefile b/core/Makefile index f118cea2b5..1e3d7a7cdd 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1646,6 +1646,7 @@ ifneq ($(dont_bother),true) include $(sort $(wildcard $(BUILD_SYSTEM)/tasks/*.mk)) -include $(sort $(wildcard vendor/*/build/tasks/*.mk)) -include $(sort $(wildcard device/*/build/tasks/*.mk)) +-include $(sort $(wildcard device/*/common/tasks/*.mk)) endif # ----------------------------------------------------------------- diff --git a/core/main.mk b/core/main.mk index d424b25bd8..bab8c5d8f3 100644 --- a/core/main.mk +++ b/core/main.mk @@ -42,15 +42,17 @@ endif ifeq (,$(findstring CYGWIN,$(shell uname -sm))) ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.81)) ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.82)) +ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 4.0)) $(warning ********************************************************************************) $(warning * You are using version $(MAKE_VERSION) of make.) -$(warning * Android can only be built by versions 3.81 and 3.82.) +$(warning * Android can only be built by versions 3.81, 3.82 and 4.0.) $(warning * see https://source.android.com/source/download.html) $(warning ********************************************************************************) $(error stopping) endif endif endif +endif # Absolute path of the present working direcotry. # This overrides the shell variable $PWD, which does not necessarily points to @@ -142,30 +144,32 @@ endif # Check for the corrent jdk ifneq ($(shell java -version 2>&1 | grep -i openjdk),) -$(info ************************************************************) -$(info You are attempting to build with an unsupported JDK.) -$(info $(space)) -$(info You use OpenJDK but only Sun/Oracle JDK is supported.) -$(info Please follow the machine setup instructions at) -$(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) -$(info ************************************************************) -$(error stop) +$(warning ************************************************************) +$(warning You are attempting to build with an unsupported JDK.) +$(warning $(space)) +$(warning AOSP errors out when using OpenJDK, saying you need to use) +$(warning Java SE 1.6 instead.) +$(warning A build with OpenJDK seems to work fine though - if you) +$(warning run into any Java errors, you may want to try using the) +$(warning version required by AOSP though using instructions at) +$(warning $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) +$(warning ************************************************************) endif # Check for the correct version of java java_version := $(shell java -version 2>&1 | head -n 1 | grep '^java .*[ "]1\.6[\. "$$]') ifeq ($(strip $(java_version)),) -$(info ************************************************************) -$(info You are attempting to build with the incorrect version) -$(info of java.) -$(info $(space)) -$(info Your version is: $(shell java -version 2>&1 | head -n 1).) -$(info The correct version is: Java SE 1.6.) -$(info $(space)) -$(info Please follow the machine setup instructions at) -$(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) -$(info ************************************************************) -$(error stop) +$(warning ************************************************************) +$(warning You are attempting to build with the incorrect version) +$(warning of java.) +$(warning $(space)) +$(warning Your version is: $(shell java -version 2>&1 | head -n 1).) +$(warning The AOSP supported version is: Java SE 1.6.) +$(warning $(space)) +$(warning Linaro builds with java version "1.7.0_09" seems to work fine though.) +$(warning AOSP supported machine setup instructions are at) +$(warning $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) +$(warning ************************************************************) endif # Check for the correct version of javac @@ -599,6 +603,10 @@ ifdef FULL_BUILD $(foreach p,$(product_FILES),$(info : $(p))) $(error done) endif + ifneq ($(TARGET_BOOTLOADER_TYPE),fastboot) + # We need (host) fs_get_stats for the boottarball target + subdirs += build/tools/fs_get_stats + endif else # We're not doing a full build, and are probably only including # a subset of the module makefiles. Don't try to build any modules |