openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am 49f80c6f: am 51e2e589: Merge "Remove the now-empty darwin AndroidConfig.h." 

* commit '49f80c6f3795a4f3a888ca80e15b15204f4b61b5':
  Remove the now-empty darwin AndroidConfig.h.
This commit is contained in:
Elliott Hughes 2015-07-30 16:32:56 +00:00 committed by Android Git Automerger
parent c73b8a80d4 49f80c6f37
commit cdb8a9acad
3 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/combo/HOST_darwin-x86.mk
View File

@ -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_SHLIB_SUFFIX := .dylib
$(combo_2nd_arch_prefix)HOST_JNILIB_SUFFIX := .jnilib $(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 $(combo_2nd_arch_prefix)HOST_GLOBAL_ARFLAGS := cqs
############################################################ ############################################################

3
core/combo/HOST_darwin-x86_64.mk
View File

@ -52,9 +52,6 @@ HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error
HOST_SHLIB_SUFFIX := .dylib HOST_SHLIB_SUFFIX := .dylib
HOST_JNILIB_SUFFIX := .jnilib HOST_JNILIB_SUFFIX := .jnilib
HOST_GLOBAL_CFLAGS += \
-include $(call select-android-config-h,darwin-x86)
HOST_GLOBAL_ARFLAGS := cqs HOST_GLOBAL_ARFLAGS := cqs
# We Reuse the following functions with the same name from HOST_darwin-x86.mk: # We Reuse the following functions with the same name from HOST_darwin-x86.mk:

35
core/combo/include/arch/darwin-x86/AndroidConfig.h
View File

@ -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*/