am 13786e28: am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules" (83533a23) · Commits · e / os / android_frameworks_base

libs/androidfw/Android.mk

+1 −5

Original line number	Diff line number	Diff line
		@@ -40,10 +40,9 @@ hostSources := $(commonSources)
		# For the host
		# =====================================================
		include $(CLEAR_VARS)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_MODULE:= libandroidfw
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_HOST_OS := darwin linux windows
		LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS
		LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
		LOCAL_SRC_FILES:= $(hostSources)
		@@ -56,13 +55,10 @@ include $(BUILD_HOST_STATIC_LIBRARY)
		# =====================================================

		include $(CLEAR_VARS)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_MODULE:= libandroidfw
		LOCAL_MODULE_TAGS := optional
		LOCAL_SRC_FILES:= $(deviceSources)
		LOCAL_C_INCLUDES := \
		external/zlib \
		system/core/include
		LOCAL_STATIC_LIBRARIES := libziparchive libbase
		LOCAL_SHARED_LIBRARIES := \

tools/aapt/Android.mk

+25 −26

Original line number	Diff line number	Diff line
		@@ -54,7 +54,6 @@ aaptTests := \
		tests/ResourceFilter_test.cpp \
		tests/ResourceTable_test.cpp

		aaptHostLdLibs :=
		aaptHostStaticLibs := \
		libandroidfw \
		libpng \
		@@ -68,17 +67,13 @@ aaptHostStaticLibs := \
		aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\"
		aaptCFlags += -Wall -Werror

		ifeq ($(HOST_OS),linux)
		aaptHostLdLibs += -lrt -ldl -lpthread
		endif
		aaptHostLdLibs_linux := -lrt -ldl -lpthread

		# Statically link libz for MinGW (Win SDK under Linux),
		# and dynamically link for all others.
		ifneq ($(strip $(USE_MINGW)),)
		aaptHostStaticLibs += libz
		else
		aaptHostLdLibs += -lz
		endif
		aaptHostStaticLibs_windows := libz
		aaptHostLdLibs_linux += -lz
		aaptHostLdLibs_darwin := -lz


		# ==========================================================
		@@ -87,13 +82,13 @@ endif
		include $(CLEAR_VARS)

		LOCAL_MODULE := libaapt
		LOCAL_CFLAGS += -Wno-format-y2k -DSTATIC_ANDROIDFW_FOR_TOOLS $(aaptCFlags)
		LOCAL_CPPFLAGS += $(aaptCppFlags)
		ifeq (darwin,$(HOST_OS))
		LOCAL_CFLAGS += -D_DARWIN_UNLIMITED_STREAMS
		endif
		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 := $(aaptHostStaticLibs)
		LOCAL_STATIC_LIBRARIES_windows := $(aaptHostStaticLibs_windows)

		include $(BUILD_HOST_STATIC_LIBRARY)

		@@ -103,11 +98,14 @@ include $(BUILD_HOST_STATIC_LIBRARY)
		include $(CLEAR_VARS)

		LOCAL_MODULE := aapt
		LOCAL_CFLAGS += $(aaptCFlags)
		LOCAL_CPPFLAGS += $(aaptCppFlags)
		LOCAL_LDLIBS += $(aaptHostLdLibs)
		LOCAL_MODULE_HOST_OS := darwin linux windows
		LOCAL_CFLAGS := $(aaptCFlags)
		LOCAL_CPPFLAGS := $(aaptCppFlags)
		LOCAL_LDLIBS_darwin := $(aaptHostLdLibs_darwin)
		LOCAL_LDLIBS_linux := $(aaptHostLdLibs_linux)
		LOCAL_SRC_FILES := $(aaptMain)
		LOCAL_STATIC_LIBRARIES += libaapt $(aaptHostStaticLibs)
		LOCAL_STATIC_LIBRARIES := libaapt $(aaptHostStaticLibs)
		LOCAL_STATIC_LIBRARIES_windows := $(aaptHostStaticLibs_windows)

		include $(BUILD_HOST_EXECUTABLE)

		@@ -116,15 +114,16 @@ include $(BUILD_HOST_EXECUTABLE)
		# Build the host tests: libaapt_tests
		# ==========================================================
		include $(CLEAR_VARS)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_MODULE := libaapt_tests
		LOCAL_CFLAGS += $(aaptCFlags)
		LOCAL_CPPFLAGS += $(aaptCppFlags)
		LOCAL_LDLIBS += $(aaptHostLdLibs)
		LOCAL_SRC_FILES += $(aaptTests)
		LOCAL_C_INCLUDES += $(LOCAL_PATH)
		LOCAL_STATIC_LIBRARIES += libaapt $(aaptHostStaticLibs)
		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/aidl/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ LOCAL_SRC_FILES := \

		LOCAL_CFLAGS := -g
		LOCAL_MODULE := aidl
		LOCAL_MODULE_HOST_OS := darwin linux windows

		include $(BUILD_HOST_EXECUTABLE)

tools/split-select/Android.mk

+20 −19

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ cIncludes := \
		external/zlib \
		frameworks/base/tools

		hostLdLibs :=
		hostStaticLibs := \
		libaapt \
		libandroidfw \
		@@ -57,17 +56,13 @@ hostStaticLibs := \

		cFlags := -Wall -Werror

		ifeq ($(HOST_OS),linux)
		hostLdLibs += -lrt -ldl -lpthread
		endif
		hostLdLibs_linux := -lrt -ldl -lpthread

		# Statically link libz for MinGW (Win SDK under Linux),
		# and dynamically link for all others.
		ifneq ($(strip $(USE_MINGW)),)
		hostStaticLibs += libz
		else
		hostLdLibs += -lz
		endif
		hostStaticLibs_windows := libz
		hostLdLibs_darwin := -lz
		hostLdLibs_linux += -lz


		# ==========================================================
		@@ -75,11 +70,12 @@ endif
		# ==========================================================
		include $(CLEAR_VARS)
		LOCAL_MODULE := libsplit-select
		LOCAL_MODULE_HOST_OS := darwin linux windows

		LOCAL_SRC_FILES := $(sources)

		LOCAL_C_INCLUDES += $(cIncludes)
		LOCAL_CFLAGS += $(cFlags) -D_DARWIN_UNLIMITED_STREAMS
		LOCAL_C_INCLUDES := $(cIncludes)
		LOCAL_CFLAGS := $(cFlags) -D_DARWIN_UNLIMITED_STREAMS

		include $(BUILD_HOST_STATIC_LIBRARY)

		@@ -93,10 +89,12 @@ LOCAL_MODULE_TAGS := tests

		LOCAL_SRC_FILES := $(testSources)

		LOCAL_C_INCLUDES += $(cIncludes)
		LOCAL_STATIC_LIBRARIES += libsplit-select $(hostStaticLibs)
		LOCAL_LDLIBS += $(hostLdLibs)
		LOCAL_CFLAGS += $(cFlags)
		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)

		@@ -105,13 +103,16 @@ include $(BUILD_HOST_NATIVE_TEST)
		# ==========================================================
		include $(CLEAR_VARS)
		LOCAL_MODULE := split-select
		LOCAL_MODULE_HOST_OS := darwin linux windows

		LOCAL_SRC_FILES := $(main)

		LOCAL_C_INCLUDES += $(cIncludes)
		LOCAL_STATIC_LIBRARIES += libsplit-select $(hostStaticLibs)
		LOCAL_LDLIBS += $(hostLdLibs)
		LOCAL_CFLAGS += $(cFlags)
		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)