Merge changes I863200b2,Ifdd9663b (10e9d250) · Commits · e / os / android_build

core/config.mk

+2 −6

Original line number	Diff line number	Diff line
		@@ -71,6 +71,8 @@ $(warning The build system needs unmodified output of grep.)
		$(error Please remove --color=always from your $$GREP_OPTIONS)
		endif

		UNAME := $(shell uname -sm)

		SRC_TARGET_DIR := $(TOPDIR)build/target
		SRC_API_DIR := $(TOPDIR)prebuilts/sdk/api
		SRC_SYSTEM_API_DIR := $(TOPDIR)prebuilts/sdk/system-api
		@@ -685,12 +687,6 @@ ifeq ($(EXPERIMENTAL_USE_OPENJDK9),)
		HOST_JDK_TOOLS_JAR := $(ANDROID_JAVA_TOOLCHAIN)/../lib/tools.jar
		endif # ifeq ($(EXPERIMENTAL_USE_OPENJDK9),)

		# Is the host JDK 64-bit version?
		HOST_JDK_IS_64BIT_VERSION :=
		ifneq ($(filter 64-Bit, $(shell $(JAVA) -version 2>&1)),)
		HOST_JDK_IS_64BIT_VERSION := true
		endif

		# It's called md5 on Mac OS and md5sum on Linux
		ifeq ($(HOST_OS),darwin)
		MD5SUM:=md5 -q

+9 −3

Original line number	Diff line number	Diff line
		@@ -97,8 +97,6 @@ endif
		# compiles except for arm/mips, so the HOST is whatever we are
		# running on

		UNAME := $(shell uname -sm)

		# HOST_OS
		ifneq (,$(findstring Linux,$(UNAME)))
		HOST_OS := linux
		@@ -110,7 +108,15 @@ ifneq (,$(findstring Macintosh,$(UNAME)))
		HOST_OS := darwin
		endif

		HOST_OS_EXTRA:=$(shell python -c "import platform; print(platform.platform())")
		HOST_OS_EXTRA := $(shell uname -rsm)
		ifeq ($(HOST_OS),linux)
		ifneq ($(wildcard /etc/os-release),)
		HOST_OS_EXTRA += $(shell source /etc/os-release; echo $$PRETTY_NAME)
		endif
		else ifeq ($(HOST_OS),darwin)
		HOST_OS_EXTRA += $(shell sw_vers -productVersion)
		endif
		HOST_OS_EXTRA := $(subst $(space),-,$(HOST_OS_EXTRA))

		# BUILD_OS is the real host doing the build.
		BUILD_OS := $(HOST_OS)

+1 −1

Original line number	Diff line number	Diff line
		@@ -214,7 +214,7 @@ ifndef BUILD_DATETIME
		BUILD_DATETIME := $(shell date +%s)
		endif

		ifneq (,$(findstring Darwin,$(shell uname -sm)))
		ifneq (,$(findstring Darwin,$(UNAME)))
		DATE := date -r $(BUILD_DATETIME)
		else
		DATE := date -d @$(BUILD_DATETIME)