Merge "Kill host Linux AndroidConfig.h." (a3fa59b1) · Commits · e / os / android_build

core/combo/HOST_linux-x86.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ endif # BUILD_HOST_static

		$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -fPIC \
		-no-canonical-prefixes \
		-include $(call select-android-config-h,linux-x86)

		$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector

+0 −2

Original line number	Diff line number	Diff line
		@@ -35,10 +35,8 @@ ifneq ($(strip $(BUILD_HOST_static)),)
		HOST_GLOBAL_LDFLAGS += -static
		endif # BUILD_HOST_static

		# TODO: Add AndroidConfig.h for linux-x86_64
		HOST_GLOBAL_CFLAGS += -fPIC \
		-no-canonical-prefixes \
		-include $(call select-android-config-h,linux-x86)

		HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector

deleted100644 → 0

+0 −43

Original line number	Diff line number	Diff line
		/*
		* 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 -- "Linux". Used for desktop x86 Linux.
		*/
		#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.
		*/

		/*
		* We need to choose between 32-bit and 64-bit off_t. All of our code should
		* agree on the same size. For desktop systems, use 64-bit values,
		* because some of our libraries (e.g. wxWidgets) expect to be built that way.
		*/
		#define _FILE_OFFSET_BITS 64
		#define _LARGEFILE_SOURCE 1

		#endif /_ANDROID_CONFIG_H/