* commit 'f06a2d3b63c56a35db89a273a80329c56713a7e3': Remove AndroidConfig.h.
This commit is contained in:
Elliott Hughes
Android Git Automerger
commit
140bd3f0f6
13 changed files with 6 additions and 224 deletions
|
|
@ -33,7 +33,8 @@ CLANG_CONFIG_EXTRA_CFLAGS += \
|
|||
-Werror=int-conversion
|
||||
|
||||
# Disable overly aggressive warning for macros defined with a leading underscore
|
||||
# This happens in AndroidConfig.h, which is included nearly everywhere.
|
||||
# This used to happen in AndroidConfig.h, which was included everywhere.
|
||||
# TODO: can we remove this now?
|
||||
CLANG_CONFIG_EXTRA_CFLAGS += \
|
||||
-Wno-reserved-id-macro
|
||||
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@
|
|||
# You can set TARGET_ARCH_VARIANT to use an arch version other
|
||||
# than ARMv5TE. Each value should correspond to a file named
|
||||
# $(BUILD_COMBOS)/arch/<name>.mk which must contain
|
||||
# makefile variable definitions similar to the preprocessor
|
||||
# defines in build/core/combo/include/arch/<combo>/AndroidConfig.h. Their
|
||||
# makefile variable definitions. Their
|
||||
# purpose is to allow module Android.mk files to selectively compile
|
||||
# different versions of code based upon the funtionality and
|
||||
# instructions available in a given architecture version.
|
||||
|
|
@ -92,8 +91,6 @@ ifeq ($(FORCE_ARM_DEBUGGING),true)
|
|||
$(combo_2nd_arch_prefix)TARGET_thumb_CFLAGS += -marm -fno-omit-frame-pointer
|
||||
endif
|
||||
|
||||
android_config_h := $(call select-android-config-h,linux-arm)
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
|
||||
-msoft-float \
|
||||
-ffunction-sections \
|
||||
|
|
@ -107,8 +104,6 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
|
|||
-no-canonical-prefixes \
|
||||
-fno-canonical-system-headers \
|
||||
$(arch_variant_cflags) \
|
||||
-include $(android_config_h) \
|
||||
-I $(dir $(android_config_h))
|
||||
|
||||
# The "-Wunused-but-set-variable" option often breaks projects that enable
|
||||
# "-Wall -Werror" due to a commom idiom "ALOGV(mesg)" where ALOGV is turned
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@
|
|||
# You can set TARGET_ARCH_VARIANT to use an arch version other
|
||||
# than ARMv5TE. Each value should correspond to a file named
|
||||
# $(BUILD_COMBOS)/arch/<name>.mk which must contain
|
||||
# makefile variable definitions similar to the preprocessor
|
||||
# defines in build/core/combo/include/arch/<combo>/AndroidConfig.h. Their
|
||||
# makefile variable definitions. Their
|
||||
# purpose is to allow module Android.mk files to selectively compile
|
||||
# different versions of code based upon the funtionality and
|
||||
# instructions available in a given architecture version.
|
||||
|
|
@ -70,8 +69,6 @@ TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined
|
|||
TARGET_GLOBAL_CFLAGS += \
|
||||
-fno-strict-aliasing \
|
||||
|
||||
android_config_h := $(call select-android-config-h,linux-arm64)
|
||||
|
||||
TARGET_GLOBAL_CFLAGS += \
|
||||
-fstack-protector \
|
||||
-ffunction-sections \
|
||||
|
|
@ -84,8 +81,6 @@ TARGET_GLOBAL_CFLAGS += \
|
|||
-no-canonical-prefixes \
|
||||
-fno-canonical-system-headers \
|
||||
$(arch_variant_cflags) \
|
||||
-include $(android_config_h) \
|
||||
-I $(dir $(android_config_h))
|
||||
|
||||
# Help catch common 32/64-bit errors.
|
||||
TARGET_GLOBAL_CFLAGS += \
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@
|
|||
# You can set TARGET_ARCH_VARIANT to use an arch version other
|
||||
# than mips32r2-fp. Each value should correspond to a file named
|
||||
# $(BUILD_COMBOS)/arch/<name>.mk which must contain
|
||||
# makefile variable definitions similar to the preprocessor
|
||||
# defines in build/core/combo/include/arch/<combo>/AndroidConfig.h. Their
|
||||
# makefile variable definitions. Their
|
||||
# purpose is to allow module Android.mk files to selectively compile
|
||||
# different versions of code based upon the funtionality and
|
||||
# instructions available in a given architecture version.
|
||||
|
|
@ -79,8 +78,6 @@ ifeq ($(FORCE_MIPS_DEBUGGING),true)
|
|||
TARGET_mips_CFLAGS += -fno-omit-frame-pointer
|
||||
endif
|
||||
|
||||
android_config_h := $(call select-android-config-h,linux-mips)
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
|
||||
$(TARGET_mips_CFLAGS) \
|
||||
-U__unix -U__unix__ -Umips \
|
||||
|
|
@ -93,8 +90,6 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
|
|||
-no-canonical-prefixes \
|
||||
-fno-canonical-system-headers \
|
||||
$(arch_variant_cflags) \
|
||||
-include $(android_config_h) \
|
||||
-I $(dir $(android_config_h))
|
||||
|
||||
ifneq ($(ARCH_MIPS_PAGE_SHIFT),)
|
||||
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -DPAGE_SHIFT=$(ARCH_MIPS_PAGE_SHIFT)
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@
|
|||
# You can set TARGET_ARCH_VARIANT to use an arch version other
|
||||
# than mips64r6. Each value should correspond to a file named
|
||||
# $(BUILD_COMBOS)/arch/<name>.mk which must contain
|
||||
# makefile variable definitions similar to the preprocessor
|
||||
# defines in build/core/combo/include/arch/<combo>/AndroidConfig.h. Their
|
||||
# makefile variable definitions. Their
|
||||
# purpose is to allow module Android.mk files to selectively compile
|
||||
# different versions of code based upon the funtionality and
|
||||
# instructions available in a given architecture version.
|
||||
|
|
@ -79,8 +78,6 @@ ifeq ($(FORCE_MIPS_DEBUGGING),true)
|
|||
TARGET_mips_CFLAGS += -fno-omit-frame-pointer
|
||||
endif
|
||||
|
||||
android_config_h := $(call select-android-config-h,linux-mips64)
|
||||
|
||||
TARGET_GLOBAL_CFLAGS += \
|
||||
$(TARGET_mips_CFLAGS) \
|
||||
-U__unix -U__unix__ -Umips \
|
||||
|
|
@ -93,8 +90,6 @@ TARGET_GLOBAL_CFLAGS += \
|
|||
-no-canonical-prefixes \
|
||||
-fno-canonical-system-headers \
|
||||
$(arch_variant_cflags) \
|
||||
-include $(android_config_h) \
|
||||
-I $(dir $(android_config_h))
|
||||
|
||||
# Help catch common 32/64-bit errors.
|
||||
TARGET_GLOBAL_CFLAGS += \
|
||||
|
|
|
|||
|
|
@ -75,8 +75,6 @@ KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
|
|||
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-x86 # x86 covers both x86 and x86_64.
|
||||
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
|
||||
|
||||
android_config_h := $(call select-android-config-h,target_linux-x86)
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
|
||||
-O2 \
|
||||
-Wa,--noexecstack \
|
||||
|
|
@ -94,8 +92,6 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
|
|||
-m32 \
|
||||
-no-canonical-prefixes \
|
||||
-fno-canonical-system-headers \
|
||||
-include $(android_config_h) \
|
||||
-I $(dir $(android_config_h))
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags)
|
||||
|
||||
|
|
|
|||
|
|
@ -99,10 +99,6 @@ TARGET_GLOBAL_CFLAGS += \
|
|||
-Werror=int-to-pointer-cast \
|
||||
-Werror=implicit-function-declaration \
|
||||
|
||||
android_config_h := $(call select-android-config-h,target_linux-x86)
|
||||
TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h))
|
||||
TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS)
|
||||
|
||||
TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags)
|
||||
|
||||
ifeq ($(ARCH_X86_HAVE_SSSE3),true) # yes, really SSSE3, not SSE3!
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2005 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Android config -- "android-arm". Used for ARM device builds.
|
||||
*/
|
||||
#ifndef _ANDROID_CONFIG_H
|
||||
#define _ANDROID_CONFIG_H
|
||||
|
||||
/*
|
||||
* ===========================================================================
|
||||
* !!! IMPORTANT !!!
|
||||
* ===========================================================================
|
||||
*
|
||||
* This file is included by ALL C/C++ source files. Don't put anything in
|
||||
* here unless you are absolutely certain it can't go anywhere else.
|
||||
*
|
||||
* Any C++ stuff must be wrapped with "#ifdef __cplusplus". Do not use "//"
|
||||
* comments.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Define if we're running on *our* linux on device or emulator.
|
||||
*/
|
||||
#define HAVE_ANDROID_OS 1
|
||||
|
||||
#endif /* _ANDROID_CONFIG_H */
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Android config -- "android-aarch64". Used for ARM aarch64 device builds.
|
||||
*/
|
||||
#ifndef _ANDROID_CONFIG_H
|
||||
#define _ANDROID_CONFIG_H
|
||||
|
||||
/*
|
||||
* ===========================================================================
|
||||
* !!! IMPORTANT !!!
|
||||
* ===========================================================================
|
||||
*
|
||||
* This file is included by ALL C/C++ source files. Don't put anything in
|
||||
* here unless you are absolutely certain it can't go anywhere else.
|
||||
*
|
||||
* Any C++ stuff must be wrapped with "#ifdef __cplusplus". Do not use "//"
|
||||
* comments.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Define if we're running on *our* linux on device or emulator.
|
||||
*/
|
||||
#define HAVE_ANDROID_OS 1
|
||||
|
||||
#endif /* _ANDROID_CONFIG_H */
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2010 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Android config -- "android-mips". Used for MIPS device builds.
|
||||
*/
|
||||
#ifndef _ANDROID_CONFIG_H
|
||||
#define _ANDROID_CONFIG_H
|
||||
|
||||
/*
|
||||
* ===========================================================================
|
||||
* !!! IMPORTANT !!!
|
||||
* ===========================================================================
|
||||
*
|
||||
* This file is included by ALL C/C++ source files. Don't put anything in
|
||||
* here unless you are absolutely certain it can't go anywhere else.
|
||||
*
|
||||
* Any C++ stuff must be wrapped with "#ifdef __cplusplus". Do not use "//"
|
||||
* comments.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Define if we're running on *our* linux on device or emulator.
|
||||
*/
|
||||
#define HAVE_ANDROID_OS 1
|
||||
|
||||
#endif /* _ANDROID_CONFIG_H */
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Android config -- "android-mips64". Used for MIPS device builds.
|
||||
*/
|
||||
#ifndef _ANDROID_CONFIG_H
|
||||
#define _ANDROID_CONFIG_H
|
||||
|
||||
/*
|
||||
* ===========================================================================
|
||||
* !!! IMPORTANT !!!
|
||||
* ===========================================================================
|
||||
*
|
||||
* This file is included by ALL C/C++ source files. Don't put anything in
|
||||
* here unless you are absolutely certain it can't go anywhere else.
|
||||
*
|
||||
* Any C++ stuff must be wrapped with "#ifdef __cplusplus". Do not use "//"
|
||||
* comments.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Define if we're running on *our* linux on device or emulator.
|
||||
*/
|
||||
#define HAVE_ANDROID_OS 1
|
||||
|
||||
#endif /* _ANDROID_CONFIG_H */
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
/*
|
||||
* Copyright 2005 The Android Open Source Project
|
||||
*
|
||||
* Android config -- "target_linux-x86". Used for x86 linux target devices.
|
||||
*/
|
||||
#ifndef _ANDROID_CONFIG_H
|
||||
#define _ANDROID_CONFIG_H
|
||||
|
||||
/*
|
||||
* ===========================================================================
|
||||
* !!! IMPORTANT !!!
|
||||
* ===========================================================================
|
||||
*
|
||||
* This file is included by ALL C/C++ source files. Don't put anything in
|
||||
* here unless you are absolutely certain it can't go anywhere else.
|
||||
*
|
||||
* Any C++ stuff must be wrapped with "#ifdef __cplusplus". Do not use "//"
|
||||
* comments.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Define if we're running on *our* linux on device or emulator.
|
||||
*/
|
||||
#define HAVE_ANDROID_OS 1
|
||||
|
||||
#endif /* _ANDROID_CONFIG_H */
|
||||
|
|
@ -256,11 +256,6 @@ ifeq ($(TARGET_CPU_ABI),)
|
|||
endif
|
||||
TARGET_CPU_ABI2 := $(strip $(TARGET_CPU_ABI2))
|
||||
|
||||
# $(1): os/arch
|
||||
define select-android-config-h
|
||||
build/core/combo/include/arch/$(1)/AndroidConfig.h
|
||||
endef
|
||||
|
||||
combo_target := HOST_
|
||||
combo_2nd_arch_prefix :=
|
||||
include $(BUILD_SYSTEM)/combo/select.mk
|
||||
|
|
|
|||
Loading…
Reference in a new issue