Merge branch 'upstream' into tizen

[platform/upstream/iotivity.git] / service / resource-container / examples / android / RCSampleServerApp / app / build.gradle

diff --git a/service/resource-container/examples/android/RCSampleServerApp/app/build.gradle b/service/resource-container/examples/android/RCSampleServerApp/app/build.gradle
old mode 100644 (file)
new mode 100755 (executable)
index bcb90e5..8a0f06d
--- a/service/resource-container/examples/android/RCSampleServerApp/app/build.gradle
+++ b/service/resource-container/examples/android/RCSampleServerApp/app/build.gradle
@@ -2,10 +2,10 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    buildToolsVersion "20.0.0"
 
     defaultConfig {
-        applicationId "org.iotivity.service.sample.server"
+        applicationId "org.iotivity.service.sample.resourcecontainer"
         minSdkVersion 21
         targetSdkVersion 21
         versionCode 1
@@ -17,11 +17,19 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    /*packagingOptions{
+        exclude 'lib/armeabi-v7a/librcs_client.so'
+        exclude 'lib/armeabi-v7a/librcs_common.so'
+        exclude 'lib/armeabi-v7a/librcs_server.so'
+    }*/
+
 }
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile(name:'iotivity-base-release', ext:'aar')
-    compile(name:'iotivity-service-release', ext:'aar')
-    compile(name:'iotivity-resource-container-release', ext:'aar')
+    //provided(name:'iotivity-armeabi-v7a-service-release', ext:'aar')
+    compile(name:'iotivity-armeabi-v7a-resource-container-release', ext:'aar')
+   // compile(name:'iotivity-armeabi-v7a-resource-container-debug', ext:'aar')
+    compile(name:'iotivity-base-armeabi-v7a-release', ext:'aar')
 }