From 7f80a9ed445afe0ade45d4f3b48576cdba9a6a18 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 30 Jul 2015 09:16:01 -0700 Subject: [PATCH] Remove the now-empty darwin AndroidConfig.h. Change-Id: Icdbb06514c099653923aae936c31abfbaeaccf7a --- core/combo/HOST_darwin-x86.mk | 4 --- core/combo/HOST_darwin-x86_64.mk | 3 -- .../include/arch/darwin-x86/AndroidConfig.h | 35 ------------------- 3 files changed, 42 deletions(-) delete mode 100644 core/combo/include/arch/darwin-x86/AndroidConfig.h diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index e77fd218f7..85c883c516 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -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 ############################################################ diff --git a/core/combo/HOST_darwin-x86_64.mk b/core/combo/HOST_darwin-x86_64.mk index 0efa78fe52..93a1b3ed50 100644 --- a/core/combo/HOST_darwin-x86_64.mk +++ b/core/combo/HOST_darwin-x86_64.mk @@ -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: diff --git a/core/combo/include/arch/darwin-x86/AndroidConfig.h b/core/combo/include/arch/darwin-x86/AndroidConfig.h deleted file mode 100644 index b783d6669f..0000000000 --- a/core/combo/include/arch/darwin-x86/AndroidConfig.h +++ /dev/null @@ -1,35 +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 -- "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*/