Remove android puppet module

We shall handle this manually

Change-Id: I2a890e208db73f1592bbd78b746a0edd829c142b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>

6 files changed, 0 insertions, 77 deletions

diff --git a/puppet/modules/android/manifests/init.pp b/puppet/modules/android/manifests/init.pp
deleted file mode 100644
index 7ed42cb..0000000
--- a/puppet/modules/android/manifests/init.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-class android {
-    case $::operatingsystem {
-        Ubuntu:     { include android::linux }
-    }
-}
-
diff --git a/puppet/modules/android/manifests/linux.pp b/puppet/modules/android/manifests/linux.pp
deleted file mode 100644
index f463362..0000000
--- a/puppet/modules/android/manifests/linux.pp
+++ /dev/null
@@ -1,58 +0,0 @@
-# Download and install Android ndk and sdk to $target. Update will be done and
-# old version will be removed if $filename is changed to point to new or older version.
-class android::linux
-{
-    $target = "/opt/android"
-    $ndk_filename = "android-ndk-r10c-linux-x86.bin"
-    $sdk_filename = "android-sdk_r23.0.2-linux.tar.gz"
-
-    file { "$target":
-        ensure  =>  directory,
-        owner   =>  root,
-        group   =>  users,
-        mode    =>  0755,
-    }
-
-    # Environment variable ANDROID_NDK_HOST depend on nodes architecture
-    $ndk_host = $::architecture ? {
-        i386    => "linux-x86",
-        default => "linux-x86_64",
-        }
-
-    file { "/etc/profile.d/android_env.sh":
-        ensure  => present,
-        content => template("android/android_env.sh.erb"),
-        }
-
-    define android_install($filename,$directory,$generic_dir,$target,$fetch) {
-        exec { "install $filename to ${target}/${directory}":
-            command =>  "/bin/bash -c '\
-                (if [ -e ${generic_dir} ]; then rm -fr ${generic_dir}; fi) \
-                && $fetch \
-                && mv ${target}/${directory} ${generic_dir} \
-                && echo $filename > ${generic_dir}/version.txt \
-                && chown -R $testuser: $generic_dir'",
-            unless => "/bin/bash -c '\
-                grep \"$filename\" ${generic_dir}/version.txt'",
-            require =>  File["$target"],
-            timeout =>  1800,
-        }
-    }
-
-    android_install {
-        "ndk":
-            filename    =>  "$ndk_filename",
-            directory   =>  "android-ndk-r10c",
-            target      =>  "$target",
-            generic_dir =>  "${target}/ndk",
-            fetch       =>  "wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86.bin -O ${target}/${ndk_filename} && chown $testuser: ${target}/${ndk_filename} && chmod 755 ${target}/${ndk_filename} && cd ${target} && ./${ndk_filename}",
-        ;
-        "sdk":
-            filename    =>  "$sdk_filename",
-            directory   =>  "android-sdk-r2302",
-            target      =>  "$target",
-            generic_dir =>  "${target}/sdk",
-            fetch       =>  "wget ${input}/ubuntu/${sdk_filename} -O - | tar -C $target -zx",
-        ;
-    }
-}
diff --git a/puppet/modules/android/templates/android_env.sh.erb b/puppet/modules/android/templates/android_env.sh.erb
deleted file mode 100644
index 644d193..0000000
--- a/puppet/modules/android/templates/android_env.sh.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-ANDROID_SDK_HOME=/opt/android/sdk
-ANDROID_NDK_HOME=/opt/android/ndk
-ANDROID_NDK_HOST=<%= ndk_host %>
-
-export ANDROID_SDK_HOME
-export ANDROID_NDK_HOME
-export ANDROID_NDK_HOST
-
diff --git a/puppet/modules/android/tests/android.pp b/puppet/modules/android/tests/android.pp
deleted file mode 100644
index 4a775a3..0000000
--- a/puppet/modules/android/tests/android.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-include android
-
-selftest::expect_no_warnings { "no warnings from android": }
diff --git a/puppet/modules/ci_tester/manifests/linux.pp b/puppet/modules/ci_tester/manifests/linux.pp
index 3b9ee1a..7caa76d 100644
--- a/puppet/modules/ci_tester/manifests/linux.pp
+++ b/puppet/modules/ci_tester/manifests/linux.pp
@@ -1,7 +1,6 @@
 class ci_tester::linux inherits ci_tester::base {
     include ccache
     include crosscompilers
-    include android
     include qnx
     include qnx650
     include imx6
diff --git a/puppet/modules/packaging_tester/manifests/linux.pp b/puppet/modules/packaging_tester/manifests/linux.pp
index 8b8c885..9932a8e 100644
--- a/puppet/modules/packaging_tester/manifests/linux.pp
+++ b/puppet/modules/packaging_tester/manifests/linux.pp
@@ -1,7 +1,6 @@
 class packaging_tester::linux inherits packaging_tester::base {
     include ccache
     include crosscompilers
-    include android
     include qnx
     include qnx650