am 51e2e589: Merge "Remove the now-empty darwin AndroidConfig.h." (49f80c6f) · Commits · e / os / android_build

core/combo/HOST_darwin-x86.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -52,10 +52,6 @@ $(combo_2nd_arch_prefix)HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error
		$(combo_2nd_arch_prefix)HOST_SHLIB_SUFFIX := .dylib
		$(combo_2nd_arch_prefix)HOST_JNILIB_SUFFIX := .jnilib

		# TODO: add AndroidConfig.h for darwin-x86_64
		$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += \
		-include $(call select-android-config-h,darwin-x86)

		$(combo_2nd_arch_prefix)HOST_GLOBAL_ARFLAGS := cqs

		############################################################

+0 −3

Original line number	Diff line number	Diff line
		@@ -52,9 +52,6 @@ HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error
		HOST_SHLIB_SUFFIX := .dylib
		HOST_JNILIB_SUFFIX := .jnilib

		HOST_GLOBAL_CFLAGS += \
		-include $(call select-android-config-h,darwin-x86)

		HOST_GLOBAL_ARFLAGS := cqs

		# We Reuse the following functions with the same name from HOST_darwin-x86.mk:

deleted100644 → 0

+0 −35

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 -- "Darwin". Used for X86 Mac OS X.
		*/
		#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.
		*/

		#endif /_ANDROID_CONFIG_H/