diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2020-12-30 17:41:01 -0600 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2020-12-30 17:52:56 -0600 |
| commit | 51170e43e87ebac98e8de4a504f134edaf22159a (patch) | |
| tree | e51532410805d44c50a71f0d012d784a1a54ff37 | |
| parent | eb5d5e01a17054a5b568c4eae9c1c09cd2ab4178 (diff) | |
| download | ATCD-51170e43e87ebac98e8de4a504f134edaf22159a.tar.gz | |
Always Define ANDROID_ABI for Compatibility
| -rw-r--r-- | ACE/include/makeinclude/platform_android.GNU | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index 519ea7aec74..b71326386a0 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -47,12 +47,15 @@ ifndef ANDROID_ABI endif endif +# Make sure android_abi or ANDROID_ABI are defined and they are the same. ifndef android_abi ifdef ANDROID_ABI android_abi := $(ANDROID_ABI) else $(error android_abi or ANDROID_ABI must be defined) endif +else + ANDROID_ABI := $(android_abi) endif # Alias neon @@ -105,8 +108,8 @@ ifdef android_ndk endif # We don't want this being used again except to signal that this is a - # cross-compile build. If it is then the resulting command (probably) wont - # exist. + # cross-compile build. If it is then the resulting command probably won't + # exist and cause an error. CROSS_COMPILE := THIS_VALUE_SHOULD_NOT_BE_USED # Ignore value of CROSS_COMPILE because ar doesn't match clang like in |