android: Replace AndroidConfigLocal.h with a header in utils/compat
This commit is contained in:
parent
85af8400df
commit
9be6b2e0b5
|
@ -117,8 +117,7 @@ LOCAL_SRC_FILES += $(call add_plugin, xcbc)
|
|||
|
||||
# build libstrongswan ----------------------------------------------------------
|
||||
|
||||
LOCAL_CFLAGS := $(strongswan_CFLAGS) \
|
||||
-include $(LOCAL_PATH)/AndroidConfigLocal.h
|
||||
LOCAL_CFLAGS := $(strongswan_CFLAGS)
|
||||
|
||||
LOCAL_MODULE := libstrongswan
|
||||
|
||||
|
|
|
@ -110,7 +110,7 @@ utils/lexparser.h utils/optionsfrom.h utils/capabilities.h utils/backtrace.h \
|
|||
utils/cpu_feature.h utils/leak_detective.h utils/printf_hook/printf_hook.h \
|
||||
utils/printf_hook/printf_hook_vstr.h utils/printf_hook/printf_hook_builtin.h \
|
||||
utils/parser_helper.h utils/test.h utils/integrity_checker.h utils/process.h \
|
||||
utils/utils/strerror.h utils/compat/windows.h utils/compat/apple.h \
|
||||
utils/utils/strerror.h utils/compat/windows.h utils/compat/apple.h utils/compat/android.h \
|
||||
utils/utils/atomics.h utils/utils/types.h utils/utils/byteorder.h \
|
||||
utils/utils/string.h utils/utils/memory.h utils/utils/tty.h utils/utils/path.h \
|
||||
utils/utils/status.h utils/utils/object.h utils/utils/time.h utils/utils/align.h
|
||||
|
@ -191,7 +191,7 @@ endif
|
|||
EXTRA_DIST = \
|
||||
asn1/oid.txt asn1/oid.pl \
|
||||
crypto/proposal/proposal_keywords_static.txt \
|
||||
Android.mk AndroidConfigLocal.h
|
||||
Android.mk
|
||||
|
||||
BUILT_SOURCES = \
|
||||
$(srcdir)/asn1/oid.c $(srcdir)/asn1/oid.h \
|
||||
|
|
|
@ -13,10 +13,19 @@
|
|||
* for more details.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup android android
|
||||
* @{ @ingroup compat
|
||||
*/
|
||||
|
||||
#ifndef ANDROID_H_
|
||||
#define ANDROID_H_
|
||||
|
||||
/* stuff defined in AndroidConfig.h, which is included using the -include
|
||||
* command-line option, thus cannot be undefined using -U CFLAGS options.
|
||||
* the reason we have to undefine these flags in the first place, is that
|
||||
* AndroidConfig.h defines them as 0, which in turn means that they are
|
||||
* actually defined. */
|
||||
|
||||
#undef HAVE_BACKTRACE
|
||||
|
||||
#endif /** ANDROID_H_ @}*/
|
|
@ -56,6 +56,9 @@
|
|||
#ifdef __APPLE__
|
||||
# include "compat/apple.h"
|
||||
#endif
|
||||
#ifdef __ANDROID__
|
||||
# include "compat/android.h"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Initialize utility functions
|
||||
|
|
Loading…
Reference in New Issue