Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't compile libaapt with the build number

Browse Source 
Only do that for the aapt binary itself. This will allow libaapt to be
converted to Soong.

Also remove a few lines that weren't doing anything: aaptCppflags was
never set, LOCAL_C_INCLUDES := $(LOCAL_PATH) is implied.

Test: m aapt
Test: aapt version
Change-Id: Ia3bcece14921417e1bfd3406630961c013bd497c
This commit is contained in:
Dan Willemsen
2017-09-08 22:02:41 -07:00
parent 85aee73e98
commit 896f01879b
3 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/aapt/Android.mk
View File

@@ -65,8 +65,7 @@ aaptHostStaticLibs := \
libbase \
libz
aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\"
aaptCFlags += -Wall -Werror
aaptCFlags := -Wall -Werror
# ==========================================================
# Build the host static library: libaapt
@@ -76,7 +75,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libaapt
LOCAL_MODULE_HOST_OS := darwin linux windows
LOCAL_CFLAGS := -Wno-format-y2k -DSTATIC_ANDROIDFW_FOR_TOOLS $(aaptCFlags)
LOCAL_CPPFLAGS := $(aaptCppFlags)
LOCAL_CFLAGS_darwin := -D_DARWIN_UNLIMITED_STREAMS
LOCAL_SRC_FILES := $(aaptSources)
LOCAL_STATIC_LIBRARIES := $(aaptHostStaticLibs)
@@ -90,8 +88,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := aapt
LOCAL_MODULE_HOST_OS := darwin linux windows
LOCAL_CFLAGS := $(aaptCFlags)
LOCAL_CPPFLAGS := $(aaptCppFlags)
LOCAL_CFLAGS := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\" $(aaptCFlags)
LOCAL_SRC_FILES := $(aaptMain)
LOCAL_STATIC_LIBRARIES := libaapt $(aaptHostStaticLibs)
@@ -105,9 +102,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libaapt_tests
LOCAL_CFLAGS := $(aaptCFlags)
LOCAL_CPPFLAGS := $(aaptCppFlags)
LOCAL_SRC_FILES := $(aaptTests)
LOCAL_C_INCLUDES := $(LOCAL_PATH)
LOCAL_STATIC_LIBRARIES := libaapt $(aaptHostStaticLibs)
include $(BUILD_HOST_NATIVE_TEST)

18
tools/aapt/Command.cpp
View File

@@ -29,24 +29,6 @@
using namespace android;
#ifndef AAPT_VERSION
#define AAPT_VERSION ""
#endif
/*
* Show version info. All the cool kids do it.
*/
int doVersion(Bundle* bundle)
{
if (bundle->getFileSpecCount() != 0) {
printf("(ignoring extra arguments)\n");
}
printf("Android Asset Packaging Tool, v0.2-" AAPT_VERSION "\n");
return 0;
}
/*
* Open the file read only. The call fails if the file doesn't exist.
*

17
tools/aapt/Main.cpp
View File

@@ -20,6 +20,23 @@ using namespace android;
static const char* gProgName = "aapt";
#ifndef AAPT_VERSION
#define AAPT_VERSION ""
#endif
/*
* Show version info. All the cool kids do it.
*/
int doVersion(Bundle* bundle)
{
if (bundle->getFileSpecCount() != 0) {
printf("(ignoring extra arguments)\n");
}
printf("Android Asset Packaging Tool, v0.2-" AAPT_VERSION "\n");
return 0;
}
/*
* When running under Cygwin on Windows, this will convert slash-based
* paths into back-slash-based ones. Otherwise the ApptAssets file comparisons