From f18e6f3eb53afb830d1eda241ae5862d69d98d92 Mon Sep 17 00:00:00 2001
From: Andrey Adamovich <andrey@aestasit.com>
Date: Sun, 6 Sep 2015 23:03:27 +0300
Subject: [PATCH 1/3] Update ndk.pp

---
 manifests/ndk.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/ndk.pp b/manifests/ndk.pp
index 1f85e60..f1766e2 100644
--- a/manifests/ndk.pp
+++ b/manifests/ndk.pp
@@ -18,7 +18,7 @@
   $ndk_version = $android::params::ndk_version
 )
 {
-  include android::params
+  include android
   include wget
 
   $base_path = "http://dl.google.com/android/ndk/${ndk_version}"
@@ -36,7 +36,7 @@
   } ->
   exec { 'run-androidndk':
     command => "${ndk_installer} -y",
-    cwd     => $android::params::installdir,
+    cwd     => $android::paths::installdir,
   }
 
 }

From 15bb50e43d64afb512ed95b9b0f82d4b2f40163f Mon Sep 17 00:00:00 2001
From: Andrey Adamovich <andrey@aestasit.com>
Date: Sun, 6 Sep 2015 23:51:38 +0300
Subject: [PATCH 2/3] Updated debian dependencies

---
 manifests/sdk.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/sdk.pp b/manifests/sdk.pp
index d0cffe0..8fb46e0 100644
--- a/manifests/sdk.pp
+++ b/manifests/sdk.pp
@@ -59,7 +59,7 @@
     ensure_packages($::osfamily ? {
       # list 64-bit version and use latest for installation too so that the same version is applied to both
       'RedHat' => ['glibc.i686','zlib.i686','libstdc++.i686','zlib','libstdc++'],
-      'Debian' => ['ia32-libs'],
+      'Debian' => ['lib32stdc++6','lib32z1'],
       default  => [],
     })
   }

From 4e7f08074d0302475f53886245f79ea8f9f05f0b Mon Sep 17 00:00:00 2001
From: Andrey Adamovich <andrey@aestasit.com>
Date: Mon, 7 Sep 2015 09:36:45 +0300
Subject: [PATCH 3/3] Update sdk_spec.rb

---
 spec/classes/sdk_spec.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spec/classes/sdk_spec.rb b/spec/classes/sdk_spec.rb
index caed826..b68504c 100644
--- a/spec/classes/sdk_spec.rb
+++ b/spec/classes/sdk_spec.rb
@@ -29,7 +29,8 @@
       :operatingsystem => 'Ubuntu',
       :osfamily => 'Debian'
     } }
-    it { should contain_package('ia32-libs') }
+    it { should contain_package('lib32stdc++6') }
+    it { should contain_package('lib32z1') }    
   end
 
   context '64bit Debian, amd64 architecture', :compile do
@@ -38,7 +39,8 @@
         :osfamily => 'Debian',
         :architecture => 'amd64'
     } }
-    it { should contain_package('ia32-libs') }
+    it { should contain_package('lib32stdc++6') }
+    it { should contain_package('lib32z1') }    
   end
 
 end