Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c2d2287 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Use more prebuilt build-tools 

For acp, we've been using an old prebuilt in prebuilts/sdk, but it's not
part of the SDK. Instead, we'll use a prebuilt in the build-tools
repository.

For ijar, we've been using the host libstdc++ to workaround the lack of
libc++ on some unbundled branches. Instead, use a prebuilt that can use
libc++.

For ziptime, we've been disabling it on unbundled branches, due to the
lack of libc++. Instead, use a prebuilt version of ziptime that can use
the prebuilt libc++.

Change-Id: If80f845ea06f76e3fe6765964e77c864eaf303d0
parent 06f3e834

core/config.mk

+3 −9
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ BUILD_PLATFORM_ZIP := $(filter platform platform-java,$(MAKECMDGOALS)) 
prebuilt_sdk_tools := prebuilts/sdk/tools

prebuilt_sdk_tools_bin := $(prebuilt_sdk_tools)/$(HOST_OS)/bin



ACP := $(HOST_OUT_EXECUTABLES)/acp

AIDL := $(HOST_OUT_EXECUTABLES)/aidl

AAPT := $(HOST_OUT_EXECUTABLES)/aapt

ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign
@@ -474,14 +473,16 @@ MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses 
# Always use prebuilts for ckati and makeparallel

prebuilt_build_tools := prebuilts/build-tools

prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/bin

ACP := $(prebuilt_build_tools_bin)/acp

CKATI := $(prebuilt_build_tools_bin)/ckati

IJAR := $(prebuilt_build_tools_bin)/ijar

MAKEPARALLEL := $(prebuilt_build_tools_bin)/makeparallel

ZIPTIME := $(prebuilt_build_tools_bin)/ziptime



USE_PREBUILT_SDK_TOOLS_IN_PLACE := true



# Override the definitions above for unbundled and PDK builds

ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))

ACP := $(prebuilt_sdk_tools_bin)/acp

AIDL := $(prebuilt_sdk_tools_bin)/aidl

AAPT := $(prebuilt_sdk_tools_bin)/aapt

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

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)



# relocation packer

core/definitions.mk

+0 −2
Original line number Diff line number Diff line
@@ -2450,11 +2450,9 @@ endef 


# Remove dynamic timestamps from packages

#

ifndef TARGET_BUILD_APPS

define remove-timestamps-from-package

$(hide) $(ZIPTIME) $@

endef

endif



# Uncompress shared libraries embedded in an apk.

#

tools/ijar/Android.bp

+0 −16
Original line number Diff line number Diff line
@@ -15,20 +15,4 @@ cc_binary_host { 
    ],

    host_ldlibs: ["-lz"],

    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++",

}