Merge changes Ia3bcece1,Icd26dc1e am: ec462238f6 am: c201a6bb7d am: 9539d236e7 (84875581) · Commits · e / os / android_frameworks_base

tools/aapt/Android.mk

+4 −24

Original line number	Diff line number	Diff line
		@@ -62,19 +62,10 @@ aaptHostStaticLibs := \
		libcutils \
		libexpat \
		libziparchive \
		libbase

		aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\"
		aaptCFlags += -Wall -Werror

		aaptHostLdLibs_linux := -lrt -ldl -lpthread

		# Statically link libz for MinGW (Win SDK under Linux),
		# and dynamically link for all others.
		aaptHostStaticLibs_windows := libz
		aaptHostLdLibs_linux += -lz
		aaptHostLdLibs_darwin := -lz
		libbase \
		libz

		aaptCFlags := -Wall -Werror

		# ==========================================================
		# Build the host static library: libaapt
		@@ -84,11 +75,9 @@ 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)
		LOCAL_STATIC_LIBRARIES_windows := $(aaptHostStaticLibs_windows)

		include $(BUILD_HOST_STATIC_LIBRARY)

		@@ -99,13 +88,9 @@ include $(CLEAR_VARS)

		LOCAL_MODULE := aapt
		LOCAL_MODULE_HOST_OS := darwin linux windows
		LOCAL_CFLAGS := $(aaptCFlags)
		LOCAL_CPPFLAGS := $(aaptCppFlags)
		LOCAL_LDLIBS_darwin := $(aaptHostLdLibs_darwin)
		LOCAL_LDLIBS_linux := $(aaptHostLdLibs_linux)
		LOCAL_CFLAGS := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\" $(aaptCFlags)
		LOCAL_SRC_FILES := $(aaptMain)
		LOCAL_STATIC_LIBRARIES := libaapt $(aaptHostStaticLibs)
		LOCAL_STATIC_LIBRARIES_windows := $(aaptHostStaticLibs_windows)

		include $(BUILD_HOST_EXECUTABLE)

		@@ -117,13 +102,8 @@ include $(CLEAR_VARS)

		LOCAL_MODULE := libaapt_tests
		LOCAL_CFLAGS := $(aaptCFlags)
		LOCAL_CPPFLAGS := $(aaptCppFlags)
		LOCAL_LDLIBS_darwin := $(aaptHostLdLibs_darwin)
		LOCAL_LDLIBS_linux := $(aaptHostLdLibs_linux)
		LOCAL_SRC_FILES := $(aaptTests)
		LOCAL_C_INCLUDES := $(LOCAL_PATH)
		LOCAL_STATIC_LIBRARIES := libaapt $(aaptHostStaticLibs)
		LOCAL_STATIC_LIBRARIES_windows := $(aaptHostStaticLibs_windows)

		include $(BUILD_HOST_NATIVE_TEST)

tools/aapt/Command.cpp

+0 −18

Original line number	Diff line number	Diff line
		@@ -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.
		*

tools/aapt/Main.cpp

+17 −0

Original line number	Diff line number	Diff line
		@@ -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

tools/aapt2/Android.bp

+1 −5

Original line number	Diff line number	Diff line
		@@ -39,14 +39,9 @@ cc_defaults {
		windows: {
		enabled: true,
		cflags: ["-Wno-maybe-uninitialized"],
		static_libs: ["libz"],
		},
		darwin: {
		cflags: ["-D_DARWIN_UNLIMITED_STREAMS"],
		host_ldlibs: ["-lz"],
		},
		linux: {
		host_ldlibs: ["-lz"],
		},
		},
		static_libs: [
		@@ -59,6 +54,7 @@ cc_defaults {
		"libpng",
		"libbase",
		"libprotobuf-cpp-lite",
		"libz",
		],
		group_static_libs: true,
		}

tools/split-select/Android.mk

+2 −16

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ testSources := \
		TestRules.cpp

		cIncludes := \
		external/zlib \
		frameworks/base/tools

		hostStaticLibs := \
		@@ -52,18 +51,11 @@ hostStaticLibs := \
		libcutils \
		libexpat \
		libziparchive \
		libbase
		libbase \
		libz

		cFlags := -Wall -Werror

		hostLdLibs_linux := -lrt -ldl -lpthread

		# Statically link libz for MinGW (Win SDK under Linux),
		# and dynamically link for all others.
		hostStaticLibs_windows := libz
		hostLdLibs_darwin := -lz
		hostLdLibs_linux += -lz


		# ==========================================================
		# Build the host static library: libsplit-select
		@@ -91,9 +83,6 @@ LOCAL_SRC_FILES := $(testSources)

		LOCAL_C_INCLUDES := $(cIncludes)
		LOCAL_STATIC_LIBRARIES := libsplit-select $(hostStaticLibs)
		LOCAL_STATIC_LIBRARIES_windows := $(hostStaticLibs_windows)
		LOCAL_LDLIBS_darwin := $(hostLdLibs_darwin)
		LOCAL_LDLIBS_linux := $(hostLdLibs_linux)
		LOCAL_CFLAGS := $(cFlags)

		include $(BUILD_HOST_NATIVE_TEST)
		@@ -109,9 +98,6 @@ LOCAL_SRC_FILES := $(main)

		LOCAL_C_INCLUDES := $(cIncludes)
		LOCAL_STATIC_LIBRARIES := libsplit-select $(hostStaticLibs)
		LOCAL_STATIC_LIBRARIES_windows := $(hostStaticLibs_windows)
		LOCAL_LDLIBS_darwin := $(hostLdLibs_darwin)
		LOCAL_LDLIBS_linux := $(hostLdLibs_linux)
		LOCAL_CFLAGS := $(cFlags)

		include $(BUILD_HOST_EXECUTABLE)