RoboDruid: make release build

diff --git a/orte/contrib/Robot_Demo/AndroidManifest.xml b/orte/contrib/Robot_Demo/AndroidManifest.xml
index 4dcc8b116a9a7f53dddba6216357b9c5d23d9fe5..c4f4259995de3658ba0ede0cf63da7e6e9712376 100644 (file)
--- a/orte/contrib/Robot_Demo/AndroidManifest.xml
+++ b/orte/contrib/Robot_Demo/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.ocera.orte.demo"
+    package="org.ocera.orte.demo.GUI"
     android:versionCode="1"
     android:versionName="1.0" >
 
@@ -15,6 +15,7 @@
 
     <application
         android:allowBackup="true"
+        android:debuggable="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
@@ -30,4 +31,4 @@
         </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java
index facca30b487848b0ea8508fd9d1b9aaeec0b3e72..6ff918fff7af5a3c4a88d66818bdabc9d9b5ed3b 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java
@@ -2,7 +2,7 @@ package org.ocera.orte.demo.GUI;
 
 import org.ocera.orte.DomainApp;
 import org.ocera.orte.Manager;
-import org.ocera.orte.demo.R;
+//import org.ocera.orte.demo.R;
 import org.ocera.orte.demo.Publishers.CraneCmdPublish;
 import org.ocera.orte.demo.Publishers.MagnetCmdPublish;
 import org.ocera.orte.demo.Publishers.MotionSpeedPublish;

diff --git a/orte/libaorte/AndroidManifest.xml b/orte/libaorte/AndroidManifest.xml
index 8555060e2f86336f30db7082b5d7bb3b7a655fa5..a77b1afe966c04c1d14318051296414864643c1d 100644 (file)
--- a/orte/libaorte/AndroidManifest.xml
+++ b/orte/libaorte/AndroidManifest.xml
@@ -11,6 +11,7 @@
 
     <application
         android:allowBackup="true"
+        android:debuggable="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >

diff --git a/orte/libaorte/jni/Application.mk b/orte/libaorte/jni/Application.mk
index 7fbf97a581afa801959ffc0646bf581287b226f8..434767090861400454fef5fbf6497b63df83d1a3 100644 (file)
--- a/orte/libaorte/jni/Application.mk
+++ b/orte/libaorte/jni/Application.mk
@@ -1,2 +1,3 @@
 APP_ABI := all
-APP_PLATFORM := android-9
\ No newline at end of file
+APP_PLATFORM := android-9
+APP_OPTIM := release