p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge changes Ib37508d4,Ia46ac30e 

* changes:
  Turn off Windows builds during BUILD_HOST_static
  zipalign: Fix build failure in static_sdk_tools.
This commit is contained in:
Dan Willemsen 2017-11-06 22:53:46 +00:00 committed by Gerrit Code Review
parent 85e391b2a2 2a6e3b00b0
commit dcd46870f2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/envsetup.mk
View File

@ -124,11 +124,13 @@ BUILD_OS := $(HOST_OS)
HOST_CROSS_OS := HOST_CROSS_OS :=
# We can cross-build Windows binaries on Linux # We can cross-build Windows binaries on Linux
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
ifeq ($(BUILD_HOST_static),)
HOST_CROSS_OS := windows HOST_CROSS_OS := windows
HOST_CROSS_ARCH := x86 HOST_CROSS_ARCH := x86
HOST_CROSS_2ND_ARCH := x86_64 HOST_CROSS_2ND_ARCH := x86_64
2ND_HOST_CROSS_IS_64_BIT := true 2ND_HOST_CROSS_IS_64_BIT := true
endif endif
endif
ifeq ($(HOST_OS),) ifeq ($(HOST_OS),)
$(error Unable to determine HOST_OS from uname -sm: $(UNAME)!) $(error Unable to determine HOST_OS from uname -sm: $(UNAME)!)

11
tools/zipalign/Android.bp
View File

@ -15,19 +15,18 @@ cc_binary_host {
cflags: ["-Wall", "-Werror"], cflags: ["-Wall", "-Werror"],
// NOTE: Do not add any shared_libs dependencies because they will break the
// static_sdk_tools target.
static_libs: [ static_libs: [
"libutils", "libutils",
"libcutils", "libcutils",
"liblog", "liblog",
"libziparchive",
"libz",
"libbase",
"libzopfli", "libzopfli",
], ],
shared_libs: [
"libbase",
"libz",
"libziparchive"
],
target: { target: {
windows: { windows: {
host_ldlibs: ["-lpthread"], host_ldlibs: ["-lpthread"],