X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=android%2Fandroid_api%2FSConscript;h=5fba6e71cb254023a0fa01cd9993692ad5453fbf;hb=b2e13cb430aeee5eca38253a454a0665eb6a68b6;hp=2575c978ad485c8684e3294b2dbe1c720da0eab6;hpb=ac8ffa40df98b2238be21c4bc3703cfa45e7871d;p=platform%2Fupstream%2Fiotivity.git

diff --git a/android/android_api/SConscript b/android/android_api/SConscript
old mode 100755
new mode 100644
index 2575c97..5fba6e7
--- a/android/android_api/SConscript
+++ b/android/android_api/SConscript
@@ -1,48 +1,48 @@
-import os
-import platform
-Import('env')
-
-android_home = env.get('ANDROID_HOME')
-
-ANDROID_TARGET_ARCH = env.get('TARGET_ARCH')
-if env.get('RELEASE'):
-	ANDROID_RELEASE="release"
-else:
-	ANDROID_RELEASE="debug"
-
-os.environ['ANDROID_HOME'] = env.get('ANDROID_HOME')
-os.environ['ANDROID_NDK_HOME'] = env.get('ANDROID_NDK')
-
-if not os.path.exists(android_home + '/platforms/android-21') or not os.path.exists(android_home + '/build-tools/20.0.0'):
-    print '''
-***************************************** Info ********************************
-*   Either 'Android API 21' is not installed or 'Android SDK Build Tools      *
-*   20.0.0' is not installed. The Android SDK Manager will now open. Please   *
-*   be sure to deselect all options, then select the following 2 packages:    *
-*       1. Under "Tools" select "Android SDK Build-tools" Revision 20.        *
-*       2. Under "Android 5.0.1 (API 21)" select "SDK Platform"               *
-*       3. Continue by selecting "Install 2 Packages"                         *
-*                                                                             *
-*   NOTE: If you have an http proxy, please press ctrl+c now and edit/create  *
-*         the following file in your $HOME directory as follows:              *
-*                                                                             *
-* Edit/Create file: "$HOME/.android/androidtool.cfg"                          *
-*                                                                             *
-*    http.proxyPort=<YOUR_PORT_NUMBER>                                        *
-*    sdkman.monitor.density=108                                               *
-*    http.proxyHost=<YOUR_HTTP_PROXY_ADDRESS>                                 *
-*    sdkman.show.update.only=true                                             *
-*    sdkman.ask.adb.restart=false                                             *
-*    sdkman.force.http=true                                                   *
-*    sdkman.show.updateonly=true                                              *
-*                                                                             *
-*******************************************************************************
-
-...Opening Android SDK Manager now. Once you are finished, the build will continue.
-'''
-    os.system(android_home + '/tools/android')
-
-jdk_env = Environment(ENV=os.environ)
-jdk_env['BUILDERS']['Gradle'] = Builder(action = env.get('ANDROID_GRADLE') + ' build -b' + os.getcwd()+'/build.gradle -PTARGET_ARCH=%s -PRELEASE=%s' %(ANDROID_TARGET_ARCH, ANDROID_RELEASE))
-jdk_env.Gradle(target="base/objs", source="base/src/main/java/org/iotivity/base/OcResource.java")
-
+import os
+import platform
+Import('env')
+
+android_home = env.get('ANDROID_HOME')
+
+ANDROID_TARGET_ARCH = env.get('TARGET_ARCH')
+if env.get('RELEASE'):
+	ANDROID_RELEASE="release"
+else:
+	ANDROID_RELEASE="debug"
+
+os.environ['ANDROID_HOME'] = env.get('ANDROID_HOME')
+os.environ['ANDROID_NDK_HOME'] = env.get('ANDROID_NDK')
+
+if not os.path.exists(android_home + '/platforms/android-21') or not os.path.exists(android_home + '/build-tools/20.0.0'):
+    print '''
+***************************************** Info ********************************
+*   Either 'Android API 21' is not installed or 'Android SDK Build Tools      *
+*   20.0.0' is not installed. The Android SDK Manager will now open. Please   *
+*   be sure to deselect all options, then select the following 2 packages:    *
+*       1. Under "Tools" select "Android SDK Build-tools" Revision 20.        *
+*       2. Under "Android 5.0.1 (API 21)" select "SDK Platform"               *
+*       3. Continue by selecting "Install 2 Packages"                         *
+*                                                                             *
+*   NOTE: If you have an http proxy, please press ctrl+c now and edit/create  *
+*         the following file in your $HOME directory as follows:              *
+*                                                                             *
+* Edit/Create file: "$HOME/.android/androidtool.cfg"                          *
+*                                                                             *
+*    http.proxyPort=<YOUR_PORT_NUMBER>                                        *
+*    sdkman.monitor.density=108                                               *
+*    http.proxyHost=<YOUR_HTTP_PROXY_ADDRESS>                                 *
+*    sdkman.show.update.only=true                                             *
+*    sdkman.ask.adb.restart=false                                             *
+*    sdkman.force.http=true                                                   *
+*    sdkman.show.updateonly=true                                              *
+*                                                                             *
+*******************************************************************************
+
+...Opening Android SDK Manager now. Once you are finished, the build will continue.
+'''
+    os.system(android_home + '/tools/android')
+
+jdk_env = Environment(ENV=os.environ)
+jdk_env['BUILDERS']['Gradle'] = Builder(action = env.get('ANDROID_GRADLE') + ' build -b' + os.getcwd()+'/build.gradle -PTARGET_ARCH=%s -PRELEASE=%s --stacktrace' %(ANDROID_TARGET_ARCH, ANDROID_RELEASE))
+jdk_env.Gradle(target="base/objs", source="base/src/main/java/org/iotivity/base/OcResource.java")
+