tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use more prebuilt build-tools"

Browse source
This commit is contained in:
Treehugger Robot 2016-06-14 22:14:06 +00:00 committed by Gerrit Code Review
commit 6c0c720389
3 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/config.mk
View file

@ -459,7 +459,6 @@ BUILD_PLATFORM_ZIP := $(filter platform platform-java,$(MAKECMDGOALS))
prebuilt_sdk_tools := prebuilts/sdk/tools prebuilt_sdk_tools := prebuilts/sdk/tools
prebuilt_sdk_tools_bin := $(prebuilt_sdk_tools)/$(HOST_OS)/bin prebuilt_sdk_tools_bin := $(prebuilt_sdk_tools)/$(HOST_OS)/bin
ACP := $(HOST_OUT_EXECUTABLES)/acp
AIDL := $(HOST_OUT_EXECUTABLES)/aidl AIDL := $(HOST_OUT_EXECUTABLES)/aidl
AAPT := $(HOST_OUT_EXECUTABLES)/aapt AAPT := $(HOST_OUT_EXECUTABLES)/aapt
ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign
@ -474,14 +473,16 @@ MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses
# Always use prebuilts for ckati and makeparallel # Always use prebuilts for ckati and makeparallel
prebuilt_build_tools := prebuilts/build-tools prebuilt_build_tools := prebuilts/build-tools
prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/bin prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/bin
ACP := $(prebuilt_build_tools_bin)/acp
CKATI := $(prebuilt_build_tools_bin)/ckati CKATI := $(prebuilt_build_tools_bin)/ckati
IJAR := $(prebuilt_build_tools_bin)/ijar
MAKEPARALLEL := $(prebuilt_build_tools_bin)/makeparallel MAKEPARALLEL := $(prebuilt_build_tools_bin)/makeparallel
ZIPTIME := $(prebuilt_build_tools_bin)/ziptime
USE_PREBUILT_SDK_TOOLS_IN_PLACE := true USE_PREBUILT_SDK_TOOLS_IN_PLACE := true
# Override the definitions above for unbundled and PDK builds # Override the definitions above for unbundled and PDK builds
ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
ACP := $(prebuilt_sdk_tools_bin)/acp
AIDL := $(prebuilt_sdk_tools_bin)/aidl AIDL := $(prebuilt_sdk_tools_bin)/aidl
AAPT := $(prebuilt_sdk_tools_bin)/aapt AAPT := $(prebuilt_sdk_tools_bin)/aapt
ZIPALIGN := $(prebuilt_sdk_tools_bin)/zipalign ZIPALIGN := $(prebuilt_sdk_tools_bin)/zipalign
@ -584,13 +585,6 @@ FUTILITY := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/futility/futility
VBOOT_SIGNER := prebuilts/misc/scripts/vboot_signer/vboot_signer.sh VBOOT_SIGNER := prebuilts/misc/scripts/vboot_signer/vboot_signer.sh
FEC := $(HOST_OUT_EXECUTABLES)/fec FEC := $(HOST_OUT_EXECUTABLES)/fec
ifndef TARGET_BUILD_APPS
ZIPTIME := $(HOST_OUT_EXECUTABLES)/ziptime$(HOST_EXECUTABLE_SUFFIX)
endif
# ijar converts a .jar file to a smaller .jar file which only has its
# interfaces.
IJAR := $(HOST_OUT_EXECUTABLES)/ijar$(BUILD_EXECUTABLE_SUFFIX)
DEXDUMP := $(HOST_OUT_EXECUTABLES)/dexdump2$(BUILD_EXECUTABLE_SUFFIX) DEXDUMP := $(HOST_OUT_EXECUTABLES)/dexdump2$(BUILD_EXECUTABLE_SUFFIX)
# relocation packer # relocation packer

2
core/definitions.mk
View file

@ -2450,11 +2450,9 @@ endef
# Remove dynamic timestamps from packages # Remove dynamic timestamps from packages
# #
ifndef TARGET_BUILD_APPS
define remove-timestamps-from-package define remove-timestamps-from-package
$(hide) $(ZIPTIME) $@ $(hide) $(ZIPTIME) $@
endef endef
endif
# Uncompress shared libraries embedded in an apk. # Uncompress shared libraries embedded in an apk.
# #

16
tools/ijar/Android.bp
View file

@ -15,20 +15,4 @@ cc_binary_host {
], ],
host_ldlibs: ["-lz"], host_ldlibs: ["-lz"],
name: "ijar", name: "ijar",
// libc++ is not supported for TARGET_BUILD_APPS builds
stl: "libstdc++",
}
cc_binary_host {
srcs: [
"classfile.cc",
"ijar.cc",
"zip.cc",
],
cflags: [
"-Wall",
"-Werror",
],
host_ldlibs: ["-lz"],
name: "ijar_libc++",
} }