Merge changes Ib37508d4,Ia46ac30e am: dcd46870f2 am: 550fa7b4d3 (acaf1a5e) · Commits · e / os / android_build

core/envsetup.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -124,11 +124,13 @@ BUILD_OS := $(HOST_OS)
		HOST_CROSS_OS :=
		# We can cross-build Windows binaries on Linux
		ifeq ($(HOST_OS),linux)
		ifeq ($(BUILD_HOST_static),)
		HOST_CROSS_OS := windows
		HOST_CROSS_ARCH := x86
		HOST_CROSS_2ND_ARCH := x86_64
		2ND_HOST_CROSS_IS_64_BIT := true
		endif
		endif

		ifeq ($(HOST_OS),)
		$(error Unable to determine HOST_OS from uname -sm: $(UNAME)!)

+5 −6

Original line number	Diff line number	Diff line
		@@ -15,17 +15,16 @@ cc_binary_host {

		cflags: ["-Wall", "-Werror"],

		// NOTE: Do not add any shared_libs dependencies because they will break the
		// static_sdk_tools target.
		static_libs: [
		"libutils",
		"libcutils",
		"liblog",
		"libzopfli",
		],

		shared_libs: [
		"libbase",
		"libziparchive",
		"libz",
		"libziparchive"
		"libbase",
		"libzopfli",
		],

		target: {