From a14feb413a7a08bc00dd28c3b04b8aea1b1d36ed Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Tue, 18 Aug 2015 16:14:29 -0700 Subject: [PATCH] Partially revert "Enabled x86_64 build for Android." This reverts commit 806b994263369d28941aa1495a0a3b54d5249cd5. Leaves in place the 64-bit code changes, but removes the 64-bit target from builds for now due to a significant increase in verification times. Change-Id: Ib86c35c2a80b9d11621b05fcf16e050f3d6d48b6 Signed-off-by: Jon A. Cruz Reviewed-on: https://gerrit.iotivity.org/gerrit/2237 Tested-by: jenkins-iotivity --- android/BuildInstructionsForAndroidAPI.txt | 5 +++-- auto_build.sh | 5 ----- resource/third_party_libs.scons | 4 ++-- service/third_party_libs.scons | 4 ++-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/android/BuildInstructionsForAndroidAPI.txt b/android/BuildInstructionsForAndroidAPI.txt index a30df42..1b0f239 100644 --- a/android/BuildInstructionsForAndroidAPI.txt +++ b/android/BuildInstructionsForAndroidAPI.txt @@ -10,10 +10,11 @@ Build Instructions for Android-API: def ndkBuild = new File(System.env.ANDROID_NDK_HOME, 'ndk-build.cmd') 4.Build scons for android and your targeted architecture (This will also build Android API): - a.scons TARGET_OS=android TARGET_ARCH= TARGET_TRANSPORT= RELEASE=1 - where can be armeabi, armeabi-v7a, x86, x86_64. + a.scons TARGET_OS=android TARGET_ARCH= TARGET_TRANSPORT=IP RELEASE=1 + where can be armeabi, armeabi-v7a, x86. Note: To build in debug mode, use RELEASE=0. Note: The minimum SDK version supported is 21. + Note: Only TARGET_TRANSPORT currently supported is IP b.If the project is setup correctly, you should see a BUILD SUCCESSFUL message on the terminal c.You should see the .aar files generated inside of '/android/android_api/base/build/outputs/aar' directory. The .aar files contain jni directory and also a .jar file diff --git a/auto_build.sh b/auto_build.sh index 750f641..806bf6a 100755 --- a/auto_build.sh +++ b/auto_build.sh @@ -72,11 +72,6 @@ function build_android() scons TARGET_OS=android TARGET_ARCH=x86 RELEASE=$1 TARGET_TRANSPORT=BT $2 scons TARGET_OS=android TARGET_ARCH=x86 RELEASE=$1 TARGET_TRANSPORT=BLE $2 - echo "*********** Build for android x86_64 *************" - scons TARGET_OS=android TARGET_ARCH=x86_64 RELEASE=$1 TARGET_TRANSPORT=IP $2 - scons TARGET_OS=android TARGET_ARCH=x86_64 RELEASE=$1 TARGET_TRANSPORT=BT $2 - scons TARGET_OS=android TARGET_ARCH=x86_64 RELEASE=$1 TARGET_TRANSPORT=BLE $2 - echo "*********** Build for android armeabi *************" scons TARGET_OS=android TARGET_ARCH=armeabi RELEASE=$1 TARGET_TRANSPORT=IP $2 scons TARGET_OS=android TARGET_ARCH=armeabi RELEASE=$1 TARGET_TRANSPORT=BT $2 diff --git a/resource/third_party_libs.scons b/resource/third_party_libs.scons index bac4cfb..46b80bd 100644 --- a/resource/third_party_libs.scons +++ b/resource/third_party_libs.scons @@ -57,11 +57,11 @@ if target_os == 'android': if target_arch == 'armeabi-v7a-hard': target_arch = 'armeabi-v7a' - if target_arch not in ['x86', 'x86_64','armeabi', 'armeabi-v7a']: + if target_arch not in ['x86', 'armeabi', 'armeabi-v7a']: if not env.GetOption('help') and not env.GetOption('clean'): print ''' *********************************** Warning *********************************** -* current only x86, x86_64, armeabi, armeabi-v7a libraries are provided! * +* current only x86, armeabi, armeabi-v7a libraries are provided! * ******************************************************************************* ''' else: diff --git a/service/third_party_libs.scons b/service/third_party_libs.scons index 6fda850..6ddeebc 100644 --- a/service/third_party_libs.scons +++ b/service/third_party_libs.scons @@ -78,11 +78,11 @@ if target_os == 'android': if target_arch == 'armeabi-v7a-hard': target_arch = 'armeabi-v7a' - if target_arch not in ['x86', 'x86_64','armeabi', 'armeabi-v7a']: + if target_arch not in ['x86', 'armeabi', 'armeabi-v7a']: if not env.GetOption('help') and not env.GetOption('clean'): print ''' *********************************** Warning *********************************** -* current only x86, x86_64, armeabi, armeabi-v7a libraries are provided! * +* current only x86, armeabi, armeabi-v7a libraries are provided! * ******************************************************************************* ''' else: -- 2.7.4