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

Commit 27a21745 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "Revert "Include build number in aapt version"" into lmp-dev

parents 14b763a0 9a9a17eb
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ LOCAL_C_INCLUDES += $(aaptCIncludes)

LOCAL_CFLAGS += -Wno-format-y2k
LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS
LOCAL_CFLAGS += -DAAPT_VERSION=\"$(BUILD_NUMBER)\"
ifeq (darwin,$(HOST_OS))
LOCAL_CFLAGS += -D_DARWIN_UNLIMITED_STREAMS
endif
+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ int doVersion(Bundle* bundle)
    if (bundle->getFileSpecCount() != 0) {
        printf("(ignoring extra arguments)\n");
    }
    printf("Android Asset Packaging Tool, v0.2-" AAPT_VERSION "\n");
    printf("Android Asset Packaging Tool, v0.2\n");

    return 0;
}