add debug obj ndk to assets folder

Author: tranleduy2000

.gitignore

@@ -74,3 +74,5 @@ src/androidTest/
 src/main/java/com/duy/ccppcompiler/packagemanager/local/
 src/main/java/com/jecelyin/editor/v2/task/
 src/gnu/
+.gitignore
+tmp/

sdlplugin/.gitignore

@@ -0,0 +1 @@
+/.gitignore

sdlplugin/addincludes.sh

@@ -21,17 +21,16 @@ rm -f ${TOPDIR}/assets/headers.zip
 zip -r9 ${TOPDIR}/assets/headers.zip include
 cd ${TOPDIR}
 
-find obj -name "SDL_android_main.o" | while read f; do
-
-    arch=`echo $f | cut -f3 -d'/'`
+find ./build/intermediates/ndkBuild/debug/obj/local/ -name "SDL_android_main.o" | while read f; do
+    echo "File = ${f}"
+    arch=`echo $f | cut -f8 -d'/'`
+    echo "Arch=${arch}"
     cd `dirname $f`
     rm -f ${TOPDIR}/assets/sdlmain-${arch}.zip
     zip -9 ${TOPDIR}/assets/sdlmain-${arch}.zip SDL_android_main.o
     cd $TOPDIR
 done
-
 cd ${TOPDIR}
 
 rm -rf ${TOPDIR}/assets/examples.zip
 zip -r9 ${TOPDIR}/assets/examples.zip Examples
-read

sdlplugin/assets/examples.zip

@@ -37,6 +37,8 @@ android {
         main {
             manifest.srcFile 'AndroidManifest.xml'
             assets.srcDir 'assets'
+            jniLibs.srcDir 'src/main/libs' //set libs as .so's location instead of jniLibs
+            jni.srcDirs = [] //disable automatic ndk-build call with auto-generated Android.mk
         }
     }
     buildTypes {

sdlplugin/assets/headers.zip

@@ -73,7 +73,7 @@ private void initUI() {
             if (mSdCardAppDir.exists() && mSdCardAppDir.isDirectory()) {
                 File include = new File(mSdCardAppDir, "/SDL/include");
                 File lib = new File(mSdCardAppDir, "/SDL/lib");
-                if (!include.exists() || !lib.exists()) {
+                if (!include.exists() || !lib.exists() || true) {
                     new InstallDevFilesTask().execute();
                 } else {
                     aboutDialog(1);
@@ -129,6 +129,14 @@ public void onCancel(DialogInterface dialog) {
                 .show();
     }
 
+    @Override
+    protected void onDestroy() {
+        if (mProgressDialog != null && mProgressDialog.isShowing()) {
+            mProgressDialog.dismiss();
+        }
+        super.onDestroy();
+    }
+
     @SuppressLint("StaticFieldLeak")
     private class InstallDevFilesTask extends AsyncTask<Void, String, Void> {
         @Override
@@ -150,33 +158,30 @@ protected Void doInBackground(Void... params) {
             try {
                 File sdlDir = new File(mSdCardAppDir, "SDL");
                 File libDir = new File(sdlDir, "/SDL/lib");
-                if (!libDir.exists()) {
-                    libDir.mkdirs();
-                    Utils.copyDirectory(new File(getCacheDir().getParentFile().getAbsolutePath() + "/lib"), libDir);
-                    new File(libDir, "libmain.so").delete();
-                    new File(libDir, "libccsdlplugin.so").delete();
-                    String arch = Build.CPU_ABI;
-                    if (arch.startsWith("mips")) {
-                        arch = "mips";
-                    }
-                    publishProgress(getString(R.string.update_install_libs));
-                    InputStream is = getAssets().open("sdlmain-" + arch + ".zip");
-                    Utils.unpackZip(is, libDir.getAbsolutePath());
-                    is.close();
-                }
-                if (!(new File(sdlDir, "include").exists())) {
-                    publishProgress(getString(R.string.update_install_headers));
-                    InputStream is = getAssets().open("headers.zip");
-                    Utils.unpackZip(is, sdlDir.getAbsolutePath());
-                    is.close();
-                }
-                if (!(new File(mSdCardAppDir, "Examples/SDL").exists())) {
-                    publishProgress(getString(R.string.update_install_examples));
-                    InputStream is = getAssets().open("examples.zip");
-                    Utils.unpackZip(is, mSdCardAppDir.getAbsolutePath());
-                    is.close();
+                libDir.mkdirs();
+                Utils.copyDirectory(new File(getCacheDir().getParentFile().getAbsolutePath() + "/lib"), libDir);
+                new File(libDir, "libmain.so").delete();
+                new File(libDir, "libccsdlplugin.so").delete();
+                String arch = Build.CPU_ABI;
+                if (arch.startsWith("mips")) {
+                    arch = "mips";
                 }
+                publishProgress(getString(R.string.update_install_libs));
+                InputStream is = getAssets().open("sdlmain-" + arch + ".zip");
+                Utils.unpackZip(is, libDir.getAbsolutePath());
+                is.close();
+
+                publishProgress(getString(R.string.update_install_headers));
+                is = getAssets().open("headers.zip");
+                Utils.unpackZip(is, sdlDir.getAbsolutePath());
+                is.close();
+
+                publishProgress(getString(R.string.update_install_examples));
+                is = getAssets().open("examples.zip");
+                Utils.unpackZip(is, mSdCardAppDir.getAbsolutePath());
+                is.close();
             } catch (IOException e) {
+                e.printStackTrace();
                 Log.e(TAG, "Error installing dev files " + e);
             }
             return null;
@@ -189,5 +194,4 @@ protected void onPostExecute(Void result) {
             aboutDialog(1);
         }
     }
-
 }