2012-08-15 00:32:42 +02:00
|
|
|
#
|
|
|
|
|
# Copyright (C) 2012 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.
|
2012-09-01 04:52:15 +02:00
|
|
|
#
|
|
|
|
|
|
2013-12-18 05:47:06 +01:00
|
|
|
ifneq ($(BUILD_TINY_ANDROID),true)
|
2012-08-15 00:32:42 +02:00
|
|
|
|
|
|
|
|
LOCAL_PATH := $(call my-dir)
|
|
|
|
|
|
2012-11-09 00:37:43 +01:00
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
# Unit tests.
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
|
2012-10-25 03:37:21 +02:00
|
|
|
test_c_flags = \
|
2013-01-11 02:12:29 +01:00
|
|
|
-fstack-protector-all \
|
2012-10-25 03:37:21 +02:00
|
|
|
-g \
|
|
|
|
|
-Wall -Wextra \
|
|
|
|
|
-Werror \
|
Upgrade libm.
This brings us up to date with FreeBSD HEAD, fixes various bugs, unifies
the set of functions we support on ARM, MIPS, and x86, fixes "long double",
adds ISO C99 support, and adds basic unit tests.
It turns out that our "long double" functions have always been broken
for non-normal numbers. This patch fixes that by not using the upstream
implementations and just forwarding to the regular "double" implementation
instead (since "long double" on Android is just "double" anyway, which is
what BSD doesn't support).
All the tests pass on ARM, MIPS, and x86, plus glibc on x86-64.
Bug: 3169850
Bug: 8012787
Bug: https://code.google.com/p/android/issues/detail?id=6697
Change-Id: If0c343030959c24bfc50d4d21c9530052c581837
2013-01-31 04:06:37 +01:00
|
|
|
-fno-builtin \
|
2012-10-25 03:37:21 +02:00
|
|
|
|
2013-10-22 12:30:12 +02:00
|
|
|
ifeq ($(TARGET_ARCH),aarch64)
|
|
|
|
|
$(info TODO: $(LOCAL_PATH)/Android.mk -fstack-protector not yet available for the AArch64 toolchain)
|
|
|
|
|
test_c_flags += -fno-stack-protector
|
|
|
|
|
endif # aarch64
|
|
|
|
|
|
2012-08-15 00:32:42 +02:00
|
|
|
test_src_files = \
|
2013-11-07 02:32:11 +01:00
|
|
|
buffer_tests.cpp \
|
2012-10-26 05:55:23 +02:00
|
|
|
dirent_test.cpp \
|
2013-04-03 05:29:40 +02:00
|
|
|
eventfd_test.cpp \
|
2013-11-07 01:20:54 +01:00
|
|
|
fcntl_test.cpp \
|
2012-11-03 01:05:20 +01:00
|
|
|
fenv_test.cpp \
|
2013-01-11 23:43:05 +01:00
|
|
|
getauxval_test.cpp \
|
2012-08-17 00:59:12 +02:00
|
|
|
getcwd_test.cpp \
|
2013-07-03 00:23:38 +02:00
|
|
|
inttypes_test.cpp \
|
2013-03-15 23:30:25 +01:00
|
|
|
libc_logging_test.cpp \
|
2012-10-29 22:27:10 +01:00
|
|
|
libgen_test.cpp \
|
2013-05-22 02:48:01 +02:00
|
|
|
malloc_test.cpp \
|
Upgrade libm.
This brings us up to date with FreeBSD HEAD, fixes various bugs, unifies
the set of functions we support on ARM, MIPS, and x86, fixes "long double",
adds ISO C99 support, and adds basic unit tests.
It turns out that our "long double" functions have always been broken
for non-normal numbers. This patch fixes that by not using the upstream
implementations and just forwarding to the regular "double" implementation
instead (since "long double" on Android is just "double" anyway, which is
what BSD doesn't support).
All the tests pass on ARM, MIPS, and x86, plus glibc on x86-64.
Bug: 3169850
Bug: 8012787
Bug: https://code.google.com/p/android/issues/detail?id=6697
Change-Id: If0c343030959c24bfc50d4d21c9530052c581837
2013-01-31 04:06:37 +01:00
|
|
|
math_test.cpp \
|
2013-02-13 17:22:07 +01:00
|
|
|
netdb_test.cpp \
|
2012-09-06 02:47:37 +02:00
|
|
|
pthread_test.cpp \
|
2012-08-15 00:32:42 +02:00
|
|
|
regex_test.cpp \
|
2013-10-19 04:39:09 +02:00
|
|
|
sched_test.cpp \
|
2012-12-01 01:40:55 +01:00
|
|
|
signal_test.cpp \
|
2012-10-25 03:37:21 +02:00
|
|
|
stack_protector_test.cpp \
|
2013-01-25 13:40:13 +01:00
|
|
|
stack_unwinding_test.cpp \
|
2013-07-09 22:25:03 +02:00
|
|
|
statvfs_test.cpp \
|
2012-09-25 02:55:15 +02:00
|
|
|
stdio_test.cpp \
|
2012-10-01 22:11:03 +02:00
|
|
|
stdlib_test.cpp \
|
2012-09-08 08:17:54 +02:00
|
|
|
string_test.cpp \
|
2013-02-13 23:35:14 +01:00
|
|
|
strings_test.cpp \
|
2012-09-13 19:52:52 +02:00
|
|
|
stubs_test.cpp \
|
2013-10-25 00:15:14 +02:00
|
|
|
sys_epoll_test.cpp \
|
Fix <sys/resource.h>.
The situation here is a bit confusing. On 64-bit, rlimit and rlimit64 are
the same, and so getrlimit/getrlimit64, setrlimit/setrlimit64,
and prlimit/prlimit64 are all the same. On 32-bit, rlimit and rlimit64 are
different. 32-bit architectures other than MIPS go one step further by having
an even more limited getrlimit system call, so arm and x86 need to use
ugetrlimit instead of getrlimit. Worse, the 32-bit architectures don't have
64-bit getrlimit- and setrlimit-equivalent system calls, and you have to use
prlimit64 instead. There's no 32-bit prlimit system call, so there's no
easy implementation of that --- what should we do if the result of prlimit64
won't fit in a struct rlimit? Since 32-bit survived without prlimit/prlimit64
for this long, I'm not going to bother implementing prlimit for 32-bit.
We need the rlimit64 functions to be able to build strace 4.8 out of the box.
Change-Id: I1903d913b23016a2fc3b9f452885ac730d71e001
2014-01-09 19:17:03 +01:00
|
|
|
sys_resource_test.cpp \
|
2013-10-03 01:59:05 +02:00
|
|
|
sys_select_test.cpp \
|
2013-09-20 01:27:24 +02:00
|
|
|
sys_sendfile_test.cpp \
|
2013-08-09 02:13:33 +02:00
|
|
|
sys_stat_test.cpp \
|
2013-11-13 22:14:31 +01:00
|
|
|
sys_syscall_test.cpp \
|
2013-10-22 22:28:46 +02:00
|
|
|
sys_time_test.cpp \
|
2014-01-03 23:49:37 +01:00
|
|
|
sys_types_test.cpp \
|
2013-01-29 02:19:43 +01:00
|
|
|
system_properties_test.cpp \
|
2013-03-14 22:38:08 +01:00
|
|
|
time_test.cpp \
|
2013-01-02 23:23:43 +01:00
|
|
|
unistd_test.cpp \
|
2012-08-15 00:32:42 +02:00
|
|
|
|
2012-09-13 02:25:30 +02:00
|
|
|
test_dynamic_ldflags = -Wl,--export-dynamic -Wl,-u,DlSymTestFunction
|
|
|
|
|
test_dynamic_src_files = \
|
2012-12-19 00:57:55 +01:00
|
|
|
dlfcn_test.cpp \
|
2012-09-13 02:25:30 +02:00
|
|
|
|
2013-06-28 19:34:09 +02:00
|
|
|
test_fortify_static_libraries = \
|
|
|
|
|
fortify1-tests-gcc fortify2-tests-gcc fortify1-tests-clang fortify2-tests-clang
|
|
|
|
|
|
2013-01-25 13:40:13 +01:00
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_MODULE := bionic-unit-tests-unwind-test-impl
|
|
|
|
|
LOCAL_CFLAGS += $(test_c_flags) -fexceptions -fnon-call-exceptions
|
|
|
|
|
LOCAL_SRC_FILES := stack_unwinding_test_impl.c
|
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_MODULE := bionic-unit-tests-unwind-test-impl-host
|
|
|
|
|
LOCAL_CFLAGS += $(test_c_flags) -fexceptions -fnon-call-exceptions
|
|
|
|
|
LOCAL_SRC_FILES := stack_unwinding_test_impl.c
|
|
|
|
|
include $(BUILD_HOST_STATIC_LIBRARY)
|
|
|
|
|
|
2012-11-09 00:37:43 +01:00
|
|
|
# Build tests for the device (with bionic's .so). Run with:
|
2012-08-15 00:32:42 +02:00
|
|
|
# adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests
|
|
|
|
|
include $(CLEAR_VARS)
|
2012-08-16 05:27:04 +02:00
|
|
|
LOCAL_MODULE := bionic-unit-tests
|
2012-09-05 23:27:17 +02:00
|
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
2012-10-25 03:37:21 +02:00
|
|
|
LOCAL_CFLAGS += $(test_c_flags)
|
2012-09-13 02:25:30 +02:00
|
|
|
LOCAL_LDFLAGS += $(test_dynamic_ldflags)
|
|
|
|
|
LOCAL_SHARED_LIBRARIES += libdl
|
|
|
|
|
LOCAL_SRC_FILES := $(test_src_files) $(test_dynamic_src_files)
|
2013-06-28 19:34:09 +02:00
|
|
|
LOCAL_WHOLE_STATIC_LIBRARIES := $(test_fortify_static_libraries)
|
2013-01-25 13:40:13 +01:00
|
|
|
LOCAL_STATIC_LIBRARIES += bionic-unit-tests-unwind-test-impl
|
2012-08-15 00:32:42 +02:00
|
|
|
include $(BUILD_NATIVE_TEST)
|
|
|
|
|
|
2012-11-09 00:37:43 +01:00
|
|
|
# Build tests for the device (with bionic's .a). Run with:
|
2012-09-06 02:47:37 +02:00
|
|
|
# adb shell /data/nativetest/bionic-unit-tests-static/bionic-unit-tests-static
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_MODULE := bionic-unit-tests-static
|
|
|
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
2012-09-13 02:25:30 +02:00
|
|
|
LOCAL_FORCE_STATIC_EXECUTABLE := true
|
2013-08-27 23:32:15 +02:00
|
|
|
LOCAL_WHOLE_STATIC_LIBRARIES += libBionicTests
|
2013-08-29 20:37:33 +02:00
|
|
|
LOCAL_STATIC_LIBRARIES += libstlport_static libstdc++ libm libc
|
2012-09-06 02:47:37 +02:00
|
|
|
include $(BUILD_NATIVE_TEST)
|
|
|
|
|
|
2013-08-27 23:32:15 +02:00
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
# We build the static unit tests as a library so they can be used both for
|
|
|
|
|
# bionic-unit-tests-static and also as part of CTS.
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_MODULE := libBionicTests
|
|
|
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|
|
|
|
LOCAL_CFLAGS += $(test_c_flags)
|
|
|
|
|
LOCAL_SRC_FILES := $(test_src_files)
|
2013-08-29 20:37:33 +02:00
|
|
|
LOCAL_CFLAGS += \
|
|
|
|
|
-DGTEST_OS_LINUX_ANDROID \
|
|
|
|
|
-DGTEST_HAS_STD_STRING \
|
|
|
|
|
|
|
|
|
|
LOCAL_C_INCLUDES += \
|
|
|
|
|
bionic bionic/libstdc++/include \
|
|
|
|
|
external/gtest/include \
|
|
|
|
|
external/stlport/stlport \
|
|
|
|
|
|
|
|
|
|
LOCAL_WHOLE_STATIC_LIBRARIES := \
|
|
|
|
|
$(test_fortify_static_libraries) \
|
|
|
|
|
bionic-unit-tests-unwind-test-impl \
|
|
|
|
|
|
2013-08-27 23:32:15 +02:00
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
|
|
2012-11-09 00:37:43 +01:00
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
# Test library for the unit tests.
|
|
|
|
|
# -----------------------------------------------------------------------------
|
2012-10-31 22:20:03 +01:00
|
|
|
|
|
|
|
|
# Build no-elf-hash-table-library.so to test dlopen(3) on a library that
|
2013-01-07 23:18:22 +01:00
|
|
|
# only has a GNU-style hash table. MIPS doesn't support GNU hash style.
|
|
|
|
|
ifneq ($(TARGET_ARCH),mips)
|
2012-10-31 22:20:03 +01:00
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_MODULE := no-elf-hash-table-library
|
|
|
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|
|
|
|
LOCAL_SRC_FILES := empty.cpp
|
|
|
|
|
LOCAL_LDFLAGS := -Wl,--hash-style=gnu
|
|
|
|
|
include $(BUILD_SHARED_LIBRARY)
|
2013-01-07 23:18:22 +01:00
|
|
|
endif
|
2012-10-31 22:20:03 +01:00
|
|
|
|
2012-11-09 00:37:43 +01:00
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
# Unit tests built against glibc.
|
|
|
|
|
# -----------------------------------------------------------------------------
|
2012-10-31 22:20:03 +01:00
|
|
|
|
2012-11-09 00:37:43 +01:00
|
|
|
# Build tests for the host (with glibc).
|
2012-08-15 00:32:42 +02:00
|
|
|
# Note that this will build against glibc, so it's not useful for testing
|
|
|
|
|
# bionic's implementation, but it does let you use glibc as a reference
|
|
|
|
|
# implementation for testing the tests themselves.
|
2012-09-13 20:01:46 +02:00
|
|
|
ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
|
2012-08-15 00:32:42 +02:00
|
|
|
include $(CLEAR_VARS)
|
2012-08-16 05:27:04 +02:00
|
|
|
LOCAL_MODULE := bionic-unit-tests-glibc
|
2012-09-05 23:27:17 +02:00
|
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
2012-10-25 03:37:21 +02:00
|
|
|
LOCAL_CFLAGS += $(test_c_flags)
|
2013-08-15 23:51:16 +02:00
|
|
|
LOCAL_LDFLAGS += -lpthread -ldl -lrt
|
2012-09-13 02:25:30 +02:00
|
|
|
LOCAL_LDFLAGS += $(test_dynamic_ldflags)
|
|
|
|
|
LOCAL_SRC_FILES := $(test_src_files) $(test_dynamic_src_files)
|
2013-01-25 13:40:13 +01:00
|
|
|
LOCAL_STATIC_LIBRARIES += bionic-unit-tests-unwind-test-impl-host
|
2012-08-15 00:32:42 +02:00
|
|
|
include $(BUILD_HOST_NATIVE_TEST)
|
2013-10-25 19:06:57 +02:00
|
|
|
|
|
|
|
|
# gtest needs ANDROID_DATA/local/tmp for death test output.
|
|
|
|
|
# Make sure to create ANDROID_DATA/local/tmp if doesn't exist.
|
|
|
|
|
# Use the current target out directory as ANDROID_DATA.
|
|
|
|
|
bionic-unit-tests-glibc-run: bionic-unit-tests-glibc
|
|
|
|
|
mkdir -p $(TARGET_OUT_DATA)/local/tmp
|
|
|
|
|
ANDROID_DATA=$(TARGET_OUT_DATA) \
|
|
|
|
|
ANDROID_ROOT=$(TARGET_OUT) \
|
|
|
|
|
$(HOST_OUT_EXECUTABLES)/bionic-unit-tests-glibc
|
2012-09-13 20:01:46 +02:00
|
|
|
endif
|
2012-09-01 04:52:15 +02:00
|
|
|
|
2013-09-06 16:43:27 +02:00
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
# Run the unit tests built against x86 bionic on an x86 host.
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
|
2013-10-17 12:41:34 +02:00
|
|
|
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
|
2013-09-06 16:43:27 +02:00
|
|
|
ifeq ($(TARGET_ARCH),x86)
|
2013-10-17 12:41:34 +02:00
|
|
|
LINKER = linker
|
|
|
|
|
else
|
|
|
|
|
LINKER = linker64
|
|
|
|
|
endif
|
2013-10-25 19:06:57 +02:00
|
|
|
# gtest needs ANDROID_DATA/local/tmp for death test output.
|
|
|
|
|
# Make sure to create ANDROID_DATA/local/tmp if doesn't exist.
|
2013-09-06 16:43:27 +02:00
|
|
|
# bionic itself should always work relative to ANDROID_DATA or ANDROID_ROOT.
|
2013-10-17 12:41:34 +02:00
|
|
|
bionic-unit-tests-run-on-host: bionic-unit-tests $(TARGET_OUT_EXECUTABLES)/$(LINKER) $(TARGET_OUT_EXECUTABLES)/sh
|
2013-10-25 19:06:57 +02:00
|
|
|
if [ ! -d /system -o ! -d /system/bin ]; then \
|
|
|
|
|
echo "Attempting to create /system/bin"; \
|
|
|
|
|
sudo mkdir -p -m 0777 /system/bin; \
|
|
|
|
|
fi
|
2013-09-06 16:43:27 +02:00
|
|
|
mkdir -p $(TARGET_OUT_DATA)/local/tmp
|
2013-10-17 12:41:34 +02:00
|
|
|
cp $(TARGET_OUT_EXECUTABLES)/$(LINKER) /system/bin
|
2013-09-19 20:28:20 +02:00
|
|
|
cp $(TARGET_OUT_EXECUTABLES)/sh /system/bin
|
2013-09-06 16:43:27 +02:00
|
|
|
ANDROID_DATA=$(TARGET_OUT_DATA) \
|
|
|
|
|
ANDROID_ROOT=$(TARGET_OUT) \
|
|
|
|
|
LD_LIBRARY_PATH=$(TARGET_OUT_SHARED_LIBRARIES) \
|
|
|
|
|
$(TARGET_OUT_DATA_NATIVE_TESTS)/bionic-unit-tests/bionic-unit-tests
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
libc: add limited FORTIFY_SOURCE support for clang
In 829c089f83ddee37203b52bcb294867a9ae7bdbc, we disabled all
FORTIFY_SOURCE support when compiling under clang. At the time,
we didn't have proper test cases, and couldn't easily create targeted
clang tests.
This change re-enables FORTIFY_SOURCE support under clang for a
limited set of functions, where we have explicit unittests available.
The functions are:
* memcpy
* memmove
* strcpy
* strncpy
* strcat
* strncat
* memset
* strlen (with modifications)
* strchr (with modifications)
* strrchr (with modifications)
It may be possible, in the future, to enable other functions. However,
I need to write unittests first.
For strlen, strchr, and strrchr, clang unconditionally calls the
fortified version of the relevant function. If it doesn't know the
size of the buffer it's dealing with, it passes in ((size_t) -1),
which is the largest possible size_t.
I added two new clang specific unittest files, primarily copied
from fortify?_test.cpp.
I've also rebuild the entire system with these changes, and didn't
observe any obvious problems.
Change-Id: If12a15089bb0ffe93824b485290d05b14355fcaa
2013-06-17 23:49:19 +02:00
|
|
|
# -----------------------------------------------------------------------------
|
2013-06-28 19:34:09 +02:00
|
|
|
# FORTIFY_SOURCE tests
|
libc: add limited FORTIFY_SOURCE support for clang
In 829c089f83ddee37203b52bcb294867a9ae7bdbc, we disabled all
FORTIFY_SOURCE support when compiling under clang. At the time,
we didn't have proper test cases, and couldn't easily create targeted
clang tests.
This change re-enables FORTIFY_SOURCE support under clang for a
limited set of functions, where we have explicit unittests available.
The functions are:
* memcpy
* memmove
* strcpy
* strncpy
* strcat
* strncat
* memset
* strlen (with modifications)
* strchr (with modifications)
* strrchr (with modifications)
It may be possible, in the future, to enable other functions. However,
I need to write unittests first.
For strlen, strchr, and strrchr, clang unconditionally calls the
fortified version of the relevant function. If it doesn't know the
size of the buffer it's dealing with, it passes in ((size_t) -1),
which is the largest possible size_t.
I added two new clang specific unittest files, primarily copied
from fortify?_test.cpp.
I've also rebuild the entire system with these changes, and didn't
observe any obvious problems.
Change-Id: If12a15089bb0ffe93824b485290d05b14355fcaa
2013-06-17 23:49:19 +02:00
|
|
|
# -----------------------------------------------------------------------------
|
2013-06-28 19:34:09 +02:00
|
|
|
|
|
|
|
|
fortify_c_includes = \
|
|
|
|
|
bionic \
|
|
|
|
|
bionic/libstdc++/include \
|
|
|
|
|
external/stlport/stlport \
|
|
|
|
|
external/gtest/include
|
|
|
|
|
fortify_test_files = fortify_test.cpp
|
libc: add limited FORTIFY_SOURCE support for clang
In 829c089f83ddee37203b52bcb294867a9ae7bdbc, we disabled all
FORTIFY_SOURCE support when compiling under clang. At the time,
we didn't have proper test cases, and couldn't easily create targeted
clang tests.
This change re-enables FORTIFY_SOURCE support under clang for a
limited set of functions, where we have explicit unittests available.
The functions are:
* memcpy
* memmove
* strcpy
* strncpy
* strcat
* strncat
* memset
* strlen (with modifications)
* strchr (with modifications)
* strrchr (with modifications)
It may be possible, in the future, to enable other functions. However,
I need to write unittests first.
For strlen, strchr, and strrchr, clang unconditionally calls the
fortified version of the relevant function. If it doesn't know the
size of the buffer it's dealing with, it passes in ((size_t) -1),
which is the largest possible size_t.
I added two new clang specific unittest files, primarily copied
from fortify?_test.cpp.
I've also rebuild the entire system with these changes, and didn't
observe any obvious problems.
Change-Id: If12a15089bb0ffe93824b485290d05b14355fcaa
2013-06-17 23:49:19 +02:00
|
|
|
|
|
|
|
|
# -Wno-error=unused-parameter needed as
|
|
|
|
|
# external/stlport/stlport/stl/_threads.c (included from
|
|
|
|
|
# external/gtest/include/gtest/gtest.h) does not compile cleanly under
|
|
|
|
|
# clang. TODO: fix this.
|
2013-06-28 19:34:09 +02:00
|
|
|
fortify_c_flags = $(test_c_flags) -Wno-error=unused-parameter
|
|
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_SRC_FILES := $(fortify_test_files)
|
|
|
|
|
LOCAL_MODULE := fortify1-tests-gcc
|
|
|
|
|
LOCAL_CFLAGS += $(fortify_c_flags) -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -DTEST_NAME=Fortify1_Gcc
|
|
|
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|
|
|
|
LOCAL_C_INCLUDES += $(fortify_c_includes)
|
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_SRC_FILES := $(fortify_test_files)
|
|
|
|
|
LOCAL_MODULE := fortify2-tests-gcc
|
|
|
|
|
LOCAL_CFLAGS += $(fortify_c_flags) -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -DTEST_NAME=Fortify2_Gcc
|
|
|
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|
|
|
|
LOCAL_C_INCLUDES += $(fortify_c_includes)
|
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
libc: add limited FORTIFY_SOURCE support for clang
In 829c089f83ddee37203b52bcb294867a9ae7bdbc, we disabled all
FORTIFY_SOURCE support when compiling under clang. At the time,
we didn't have proper test cases, and couldn't easily create targeted
clang tests.
This change re-enables FORTIFY_SOURCE support under clang for a
limited set of functions, where we have explicit unittests available.
The functions are:
* memcpy
* memmove
* strcpy
* strncpy
* strcat
* strncat
* memset
* strlen (with modifications)
* strchr (with modifications)
* strrchr (with modifications)
It may be possible, in the future, to enable other functions. However,
I need to write unittests first.
For strlen, strchr, and strrchr, clang unconditionally calls the
fortified version of the relevant function. If it doesn't know the
size of the buffer it's dealing with, it passes in ((size_t) -1),
which is the largest possible size_t.
I added two new clang specific unittest files, primarily copied
from fortify?_test.cpp.
I've also rebuild the entire system with these changes, and didn't
observe any obvious problems.
Change-Id: If12a15089bb0ffe93824b485290d05b14355fcaa
2013-06-17 23:49:19 +02:00
|
|
|
|
2013-06-28 19:34:09 +02:00
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_SRC_FILES := $(fortify_test_files)
|
|
|
|
|
LOCAL_MODULE := fortify1-tests-clang
|
|
|
|
|
LOCAL_CLANG := true
|
|
|
|
|
LOCAL_CFLAGS += $(fortify_c_flags) -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -DTEST_NAME=Fortify1_Clang
|
libc: add limited FORTIFY_SOURCE support for clang
In 829c089f83ddee37203b52bcb294867a9ae7bdbc, we disabled all
FORTIFY_SOURCE support when compiling under clang. At the time,
we didn't have proper test cases, and couldn't easily create targeted
clang tests.
This change re-enables FORTIFY_SOURCE support under clang for a
limited set of functions, where we have explicit unittests available.
The functions are:
* memcpy
* memmove
* strcpy
* strncpy
* strcat
* strncat
* memset
* strlen (with modifications)
* strchr (with modifications)
* strrchr (with modifications)
It may be possible, in the future, to enable other functions. However,
I need to write unittests first.
For strlen, strchr, and strrchr, clang unconditionally calls the
fortified version of the relevant function. If it doesn't know the
size of the buffer it's dealing with, it passes in ((size_t) -1),
which is the largest possible size_t.
I added two new clang specific unittest files, primarily copied
from fortify?_test.cpp.
I've also rebuild the entire system with these changes, and didn't
observe any obvious problems.
Change-Id: If12a15089bb0ffe93824b485290d05b14355fcaa
2013-06-17 23:49:19 +02:00
|
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
2013-06-28 19:34:09 +02:00
|
|
|
LOCAL_C_INCLUDES += $(fortify_c_includes)
|
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
libc: add limited FORTIFY_SOURCE support for clang
In 829c089f83ddee37203b52bcb294867a9ae7bdbc, we disabled all
FORTIFY_SOURCE support when compiling under clang. At the time,
we didn't have proper test cases, and couldn't easily create targeted
clang tests.
This change re-enables FORTIFY_SOURCE support under clang for a
limited set of functions, where we have explicit unittests available.
The functions are:
* memcpy
* memmove
* strcpy
* strncpy
* strcat
* strncat
* memset
* strlen (with modifications)
* strchr (with modifications)
* strrchr (with modifications)
It may be possible, in the future, to enable other functions. However,
I need to write unittests first.
For strlen, strchr, and strrchr, clang unconditionally calls the
fortified version of the relevant function. If it doesn't know the
size of the buffer it's dealing with, it passes in ((size_t) -1),
which is the largest possible size_t.
I added two new clang specific unittest files, primarily copied
from fortify?_test.cpp.
I've also rebuild the entire system with these changes, and didn't
observe any obvious problems.
Change-Id: If12a15089bb0ffe93824b485290d05b14355fcaa
2013-06-17 23:49:19 +02:00
|
|
|
|
2013-06-28 19:34:09 +02:00
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_SRC_FILES := $(fortify_test_files)
|
|
|
|
|
LOCAL_MODULE := fortify2-tests-clang
|
|
|
|
|
LOCAL_CLANG := true
|
|
|
|
|
LOCAL_CFLAGS += $(fortify_c_flags) -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -DTEST_NAME=Fortify2_Clang
|
|
|
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|
|
|
|
LOCAL_C_INCLUDES += $(fortify_c_includes)
|
libc: add limited FORTIFY_SOURCE support for clang
In 829c089f83ddee37203b52bcb294867a9ae7bdbc, we disabled all
FORTIFY_SOURCE support when compiling under clang. At the time,
we didn't have proper test cases, and couldn't easily create targeted
clang tests.
This change re-enables FORTIFY_SOURCE support under clang for a
limited set of functions, where we have explicit unittests available.
The functions are:
* memcpy
* memmove
* strcpy
* strncpy
* strcat
* strncat
* memset
* strlen (with modifications)
* strchr (with modifications)
* strrchr (with modifications)
It may be possible, in the future, to enable other functions. However,
I need to write unittests first.
For strlen, strchr, and strrchr, clang unconditionally calls the
fortified version of the relevant function. If it doesn't know the
size of the buffer it's dealing with, it passes in ((size_t) -1),
which is the largest possible size_t.
I added two new clang specific unittest files, primarily copied
from fortify?_test.cpp.
I've also rebuild the entire system with these changes, and didn't
observe any obvious problems.
Change-Id: If12a15089bb0ffe93824b485290d05b14355fcaa
2013-06-17 23:49:19 +02:00
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
|
|
2012-09-01 04:52:15 +02:00
|
|
|
endif # !BUILD_TINY_ANDROID
|