cd1da4e04f
With mingw 4.8, the new default packed behavior is broken and makes zip archive fails due to unexpected misalignment in CentralDirectoryRecord. This patch uses -mno-ms-bitfields to revert to the old packed behavior. Change-Id: Ic977c841e330e19451db1d31ddb22e570a525062
77 lines
2 KiB
Makefile
77 lines
2 KiB
Makefile
#
|
|
# Copyright (C) 2013 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
LOCAL_PATH := $(call my-dir)
|
|
include $(CLEAR_VARS)
|
|
|
|
source_files := \
|
|
zip_archive.h \
|
|
zip_archive.cc
|
|
|
|
includes := external/zlib
|
|
|
|
LOCAL_CPP_EXTENSION := .cc
|
|
LOCAL_SRC_FILES := ${source_files}
|
|
|
|
LOCAL_STATIC_LIBRARIES := libz
|
|
LOCAL_SHARED_LIBRARIES := libutils
|
|
LOCAL_MODULE:= libziparchive
|
|
|
|
LOCAL_C_INCLUDES += ${includes}
|
|
LOCAL_CFLAGS := -Werror
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := libziparchive
|
|
LOCAL_CPP_EXTENSION := .cc
|
|
LOCAL_SRC_FILES := ${source_files}
|
|
LOCAL_C_INCLUDES += ${includes}
|
|
|
|
LOCAL_STATIC_LIBRARIES := libz libutils
|
|
LOCAL_MODULE:= libziparchive-host
|
|
LOCAL_CFLAGS := -Werror
|
|
ifneq ($(strip $(USE_MINGW)),)
|
|
LOCAL_CFLAGS += -mno-ms-bitfields
|
|
endif
|
|
LOCAL_MULTILIB := both
|
|
include $(BUILD_HOST_STATIC_LIBRARY)
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := ziparchive-tests
|
|
LOCAL_CPP_EXTENSION := .cc
|
|
LOCAL_CFLAGS += \
|
|
-DGTEST_OS_LINUX_ANDROID \
|
|
-DGTEST_HAS_STD_STRING \
|
|
-Werror
|
|
LOCAL_SRC_FILES := zip_archive_test.cc
|
|
LOCAL_SHARED_LIBRARIES := liblog
|
|
LOCAL_STATIC_LIBRARIES := libziparchive libz libgtest libgtest_main libutils
|
|
include $(BUILD_NATIVE_TEST)
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := ziparchive-tests-host
|
|
LOCAL_CPP_EXTENSION := .cc
|
|
LOCAL_CFLAGS += \
|
|
-DGTEST_OS_LINUX \
|
|
-DGTEST_HAS_STD_STRING \
|
|
-Werror
|
|
LOCAL_SRC_FILES := zip_archive_test.cc
|
|
LOCAL_STATIC_LIBRARIES := libziparchive-host \
|
|
libz \
|
|
libgtest_host \
|
|
libgtest_main_host \
|
|
liblog \
|
|
libutils
|
|
include $(BUILD_HOST_NATIVE_TEST)
|