16d1af167f
In 829c089f83, 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
171 lines
5.7 KiB
Makefile
171 lines
5.7 KiB
Makefile
#
|
|
# 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.
|
|
#
|
|
|
|
ifneq ($(BUILD_TINY_ANDROID), true)
|
|
|
|
LOCAL_PATH := $(call my-dir)
|
|
|
|
# -----------------------------------------------------------------------------
|
|
# Benchmarks.
|
|
# -----------------------------------------------------------------------------
|
|
|
|
benchmark_c_flags = \
|
|
-O2 \
|
|
-Wall -Wextra \
|
|
-Werror \
|
|
-fno-builtin \
|
|
|
|
benchmark_src_files = \
|
|
benchmark_main.cpp \
|
|
math_benchmark.cpp \
|
|
property_benchmark.cpp \
|
|
string_benchmark.cpp \
|
|
time_benchmark.cpp \
|
|
|
|
# Build benchmarks for the device (with bionic's .so). Run with:
|
|
# adb shell bionic-benchmarks
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := bionic-benchmarks
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|
LOCAL_CFLAGS += $(benchmark_c_flags)
|
|
LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include
|
|
LOCAL_SHARED_LIBRARIES += libstlport
|
|
LOCAL_SRC_FILES := $(benchmark_src_files)
|
|
include $(BUILD_EXECUTABLE)
|
|
|
|
# -----------------------------------------------------------------------------
|
|
# Unit tests.
|
|
# -----------------------------------------------------------------------------
|
|
|
|
test_c_flags = \
|
|
-fstack-protector-all \
|
|
-g \
|
|
-Wall -Wextra \
|
|
-Werror \
|
|
-fno-builtin \
|
|
|
|
test_src_files = \
|
|
dirent_test.cpp \
|
|
eventfd_test.cpp \
|
|
fenv_test.cpp \
|
|
fortify1_test.cpp \
|
|
fortify2_test.cpp \
|
|
getauxval_test.cpp \
|
|
getcwd_test.cpp \
|
|
libc_logging_test.cpp \
|
|
libgen_test.cpp \
|
|
malloc_test.cpp \
|
|
math_test.cpp \
|
|
netdb_test.cpp \
|
|
pthread_test.cpp \
|
|
regex_test.cpp \
|
|
signal_test.cpp \
|
|
stack_protector_test.cpp \
|
|
stdio_test.cpp \
|
|
stdlib_test.cpp \
|
|
string_test.cpp \
|
|
strings_test.cpp \
|
|
stubs_test.cpp \
|
|
system_properties_test.cpp \
|
|
time_test.cpp \
|
|
unistd_test.cpp \
|
|
|
|
test_dynamic_ldflags = -Wl,--export-dynamic -Wl,-u,DlSymTestFunction
|
|
test_dynamic_src_files = \
|
|
dlfcn_test.cpp \
|
|
|
|
# Build tests for the device (with bionic's .so). Run with:
|
|
# adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := bionic-unit-tests
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|
LOCAL_CFLAGS += $(test_c_flags)
|
|
LOCAL_LDFLAGS += $(test_dynamic_ldflags)
|
|
LOCAL_SHARED_LIBRARIES += libdl
|
|
LOCAL_SRC_FILES := $(test_src_files) $(test_dynamic_src_files)
|
|
LOCAL_WHOLE_STATIC_LIBRARIES := bionic-unit-tests-clang
|
|
include $(BUILD_NATIVE_TEST)
|
|
|
|
# Build tests for the device (with bionic's .a). Run with:
|
|
# 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
|
|
LOCAL_CFLAGS += $(test_c_flags)
|
|
LOCAL_FORCE_STATIC_EXECUTABLE := true
|
|
LOCAL_SRC_FILES := $(test_src_files)
|
|
LOCAL_STATIC_LIBRARIES += libstlport_static libstdc++ libm libc
|
|
LOCAL_WHOLE_STATIC_LIBRARIES := bionic-unit-tests-clang
|
|
include $(BUILD_NATIVE_TEST)
|
|
|
|
# -----------------------------------------------------------------------------
|
|
# Test library for the unit tests.
|
|
# -----------------------------------------------------------------------------
|
|
|
|
# Build no-elf-hash-table-library.so to test dlopen(3) on a library that
|
|
# only has a GNU-style hash table. MIPS doesn't support GNU hash style.
|
|
ifneq ($(TARGET_ARCH),mips)
|
|
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)
|
|
endif
|
|
|
|
# -----------------------------------------------------------------------------
|
|
# Unit tests built against glibc.
|
|
# -----------------------------------------------------------------------------
|
|
|
|
# Build tests for the host (with glibc).
|
|
# 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.
|
|
ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := bionic-unit-tests-glibc
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|
LOCAL_CFLAGS += $(test_c_flags)
|
|
LOCAL_LDFLAGS += -lpthread -ldl
|
|
LOCAL_LDFLAGS += $(test_dynamic_ldflags)
|
|
LOCAL_SRC_FILES := $(test_src_files) $(test_dynamic_src_files)
|
|
include $(BUILD_HOST_NATIVE_TEST)
|
|
endif
|
|
|
|
# -----------------------------------------------------------------------------
|
|
# Unit tests which depend on clang as the compiler
|
|
# -----------------------------------------------------------------------------
|
|
include $(CLEAR_VARS)
|
|
LOCAL_SRC_FILES := fortify1_test_clang.cpp fortify2_test_clang.cpp
|
|
LOCAL_MODULE := bionic-unit-tests-clang
|
|
LOCAL_CLANG := true
|
|
|
|
# -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.
|
|
LOCAL_CFLAGS += $(test_c_flags) -Wno-error=unused-parameter
|
|
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|
LOCAL_C_INCLUDES += bionic \
|
|
bionic/libstdc++/include \
|
|
external/stlport/stlport \
|
|
external/gtest/include
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
endif # !BUILD_TINY_ANDROID
|