From a055a73b1431abe7bc04d3886e2b166757ae2992 Mon Sep 17 00:00:00 2001 From: Fred Hornsey Date: Wed, 30 Dec 2020 17:41:01 -0600 Subject: Always Define ANDROID_ABI for Compatibility --- ACE/include/makeinclude/platform_android.GNU | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index 699ba459eb8..6f012cd98ec 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -28,12 +28,15 @@ versioned_so = 3 # This section deals with selecting the architecture/compiler # As of writing information on ABIs can be found at https://developer.android.com/ndk/guides/abis +# 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 @@ -80,8 +83,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 -- cgit v1.2.1