diff options
| author | Johnny Willemsen <jwillemsen@users.noreply.github.com> | 2016-09-27 09:19:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-27 09:19:54 +0200 |
| commit | 6dbb27d53a7f2ed1f4f726db1f467d9f3149643e (patch) | |
| tree | 91069ffe4d680e251b38487aeca77dfdf201d760 | |
| parent | 01603b83ed00bdbc86f01c0d0d178048dcfc5318 (diff) | |
| parent | fd0d79f44b951665480b34449d969fa20cdf43ac (diff) | |
| download | ATCD-6dbb27d53a7f2ed1f4f726db1f467d9f3149643e.tar.gz | |
Merge pull request #304 from jwillemsen/master
Set ACE_PLATFORM_CONFIG to config-android.h
| -rw-r--r-- | ACE/include/makeinclude/platform_android.GNU | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index 756ba7e2d03..84d1a85a2b5 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -3,6 +3,9 @@ # This file should allow ACE to be built for Android 2.3.1 (API Level 9) # or greater, by cross compiling on Linux. +# We always include config-android.h on Android platforms. +ACE_PLATFORM_CONFIG ?= config-android.h + # The standalone gcc compilers in NDK r6-r9 have issues with the visibility. no_hidden_visibility ?= 1 |