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

Commit ad751224 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

Include build number in aapt version 

Teams are constantly confused over which version of aapt
they are running. Include the build number from the
Android build system in the binary. Can be retrieved by executing
'aapt version'.

Change-Id: I9165c7d01f977344e143c2cb4dd963310ab28b72
parent 90aefa20

tools/aapt/Android.mk

+8 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ aaptHostStaticLibs := \ 
    libexpat \

    libziparchive-host



aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER)\"



ifeq ($(HOST_OS),linux)

    aaptHostLdLibs += -lrt -ldl -lpthread

endif
@@ -91,6 +93,7 @@ LOCAL_C_INCLUDES += $(aaptCIncludes) 


LOCAL_CFLAGS += -Wno-format-y2k

LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS

LOCAL_CFLAGS += $(aaptCFlags)

ifeq (darwin,$(HOST_OS))

LOCAL_CFLAGS += -D_DARWIN_UNLIMITED_STREAMS

endif
@@ -110,7 +113,9 @@ LOCAL_SRC_FILES := $(aaptMain) 
LOCAL_STATIC_LIBRARIES += \

    libaapt \

    $(aaptHostStaticLibs)



LOCAL_LDLIBS += $(aaptHostLdLibs)

LOCAL_CFLAGS += $(aaptCFlags)



include $(BUILD_HOST_EXECUTABLE)
@@ -128,7 +133,9 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH) 
LOCAL_STATIC_LIBRARIES += \

    libaapt \

    $(aaptHostStaticLibs)



LOCAL_LDLIBS += $(aaptHostLdLibs)

LOCAL_CFLAGS += $(aaptCFlags)



include $(BUILD_HOST_NATIVE_TEST)
@@ -159,6 +166,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libstlport_static \

    libexpat_static



LOCAL_CFLAGS += $(aaptCFlags)

LOCAL_CPPFLAGS += -Wno-non-virtual-dtor



include $(BUILD_EXECUTABLE)

tools/aapt/Command.cpp

+5 −1
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ 


using namespace android;



#ifndef AAPT_VERSION

    #define AAPT_VERSION ""

#endif



/*

 * Show version info.  All the cool kids do it.

 */
@@ -32,7 +36,7 @@ int doVersion(Bundle* bundle) 
    if (bundle->getFileSpecCount() != 0) {

        printf("(ignoring extra arguments)\n");

    }

    printf("Android Asset Packaging Tool, v0.2\n");

    printf("Android Asset Packaging Tool, v0.2-" AAPT_VERSION "\n");



    return 0;

}