build; android; account for x86 arch for emulator builds, correctly p…

…lacing them in the x86 libs folder instead of armeabi like before.
snowkit · Feb 13, 2015 · b449637 · b449637
1 parent 867126f
commit b449637
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/flow/config.json b/src/flow/config.json
@@ -53,7 +53,7 @@
             "activity_name" : "MainActivity",
             "binary_source_name" : "lib{{app.boot}}{{app.debugtag}}{{app.archtag}}.so",
             "binary_dest_name" : "lib{{app.name}}.so",
-            "binary_dest_path" : "{{paths.build}}/{{paths.android.project}}/libs/armeabi",
+            "binary_dest_path" : "{{paths.build}}/{{paths.android.project}}/libs/{{paths.android.libabi}}",
             "files_dest_path" : "{{paths.build}}/{{paths.android.project}}/assets"
         },
 

diff --git a/src/flow/project/prepare.js b/src/flow/project/prepare.js
@@ -98,12 +98,24 @@ internal.prepare_config = function(flow) {
 internal.prepare_config_paths = function(flow, prepared) {
 
     flow.project.paths = {
-        android : { project : flow.config.build.android.project },
+        android : { project : flow.config.build.android.project, libabi:'armeabi' },
         ios     : { project : flow.config.build.ios.project },
         output  : flow.project.get_path_output(flow, prepared),
         build   : flow.project.get_path_build(flow, prepared)
     }
 
+    if(flow.target == 'android') {
+        switch(flow.target_arch) {
+            case 'x86':
+                flow.project.paths.android.libabi = 'x86';
+            break;
+            default:
+                flow.project.paths.android.libabi = 'armeabi';
+            break;
+        }
+    }
+
+
         //store for use later against files etc
     flow.project.path_context = flow.project.get_path_context(flow, prepared, flow.target_arch);
 

diff --git a/src/flow/project/project.js b/src/flow/project/project.js
@@ -275,6 +275,9 @@ exports.get_path_context = function(flow, prepared, target_arch) {
             case 'armv7':
                 path_context.app.archtag = '-v7';
                 break;
+            case 'x86':
+                path_context.app.archtag = '-x86';
+                break;
             case 'armv7s':
                 path_context.app.archtag = '-v7s';
                 break;