Read ndk installdir from android class instead of default value

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,
   }
 
 }

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  => [],
     })
   }

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