Intermodalics · ivanpauno · Jan 24, 2019 · Jan 8, 2019 · Jan 8, 2019 · Jan 8, 2019
diff --git a/do_everything.sh b/do_everything.sh
@@ -297,6 +297,9 @@ if [[ $skip -ne 1 ]] ; then
     # Patch urdf - Fixed linking with pluginlib and dependencies in downstream packages
     apply_patch $my_loc/patches/urdf.patch
 
+    # Patch move_base - Solved transitive linking problems
+    apply_patch $my_loc/patches/move_base.patch
+
     # Patch global_planner - Add angles dependency
     # TODO: PR merged: https://github.com/ros-planning/navigation/pull/359
     # Wait for next release to remove (current 1.12.4)

diff --git a/example_workspace/src/image_transport_sample_app/AndroidManifest.xml.in b/example_workspace/src/image_transport_sample_app/AndroidManifest.xml.in
diff --git a/example_workspace/src/image_transport_sample_app/CMakeLists.txt b/example_workspace/src/image_transport_sample_app/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 2.8.3)
+project(image_transport_sample)
+
+find_package(catkin REQUIRED rosjava_build_tools)
+
+catkin_android_setup(assemble${CMAKE_BUILD_TYPE})
+
+catkin_package()
diff --git a/example_workspace/src/image_transport_sample_app/build.gradle b/example_workspace/src/image_transport_sample_app/build.gradle
@@ -0,0 +1,21 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+       google()
+       jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/example_workspace/src/image_transport_sample_app/custom_rules.xml.in b/example_workspace/src/image_transport_sample_app/custom_rules.xml.in
diff --git a/example_workspace/src/image_transport_sample_app/gradle.properties b/example_workspace/src/image_transport_sample_app/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
diff --git a/example_workspace/src/image_transport_sample_app/gradle/wrapper/gradle-wrapper.jar b/example_workspace/src/image_transport_sample_app/gradle/wrapper/gradle-wrapper.jar
diff --git a/example_workspace/src/image_transport_sample_app/gradle/wrapper/gradle-wrapper.properties b/example_workspace/src/image_transport_sample_app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sun Feb 05 19:39:12 IST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/example_workspace/src/image_transport_sample_app/gradlew b/example_workspace/src/image_transport_sample_app/gradlew
diff --git a/example_workspace/src/image_transport_sample_app/gradlew.bat b/example_workspace/src/image_transport_sample_app/gradlew.bat
diff --git a/example_workspace/src/image_transport_sample_app/ic_launcher.png b/example_workspace/src/image_transport_sample_app/ic_launcher.png
diff --git a/example_workspace/src/image_transport_sample_app/jni/Android.mk.in b/example_workspace/src/image_transport_sample_app/jni/Android.mk.in
diff --git a/example_workspace/src/image_transport_sample_app/jni/Application.mk b/example_workspace/src/image_transport_sample_app/jni/Application.mk