From b68ae2f3dc2b66f20696e8e022c708cd3f2cfe37 Mon Sep 17 00:00:00 2001
From: shmyga <shmyga.z@gmail.com>
Date: Tue, 21 Jan 2020 20:58:37 +0300
Subject: [PATCH] [core] add config android extenions param

---
 haxetool/core.js     | 2 ++
 haxetool/project.js  | 2 +-
 package.json         | 2 +-
 template/project.xml | 4 ++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/haxetool/core.js b/haxetool/core.js
index b135019..b56780b 100644
--- a/haxetool/core.js
+++ b/haxetool/core.js
@@ -47,6 +47,7 @@ class Config {
             fps: 60,
         };
         this.key = null;
+        this.android = [];
         if (params) {
             this.update(params);
             this.afterUpdate();
@@ -70,6 +71,7 @@ class Config {
         if (params.flags !== undefined) this.flags = this.flags.concat(params.flags);
         if (params.meta !== undefined) this.meta = {...this.meta, ...params.meta};
         if (params.key !== undefined) this.key = params.key;
+        if (params.android !== undefined) this.android = this.android.concat(params.android.map(item => ({path: Config.absolutePath(item.path), extensions: item.extensions})));
         if (this.meta.icon) this.icon = Config.absolutePath(this.meta.icon);
     }
 
diff --git a/haxetool/project.js b/haxetool/project.js
index 8c9b491..ad76f1b 100755
--- a/haxetool/project.js
+++ b/haxetool/project.js
@@ -450,7 +450,7 @@ class AndroidRunner extends Runner {
 
     call() {
         const target = this.targetPath;
-        return this.log(gulp.src(`${target}/${this.config.meta.filename}_*.apk`)
+        return this.log(gulp.src(`${target}/${this.config.meta.filename}_${this.config.meta.version}.apk`)
             .pipe(this.android.apk())
             .pipe(this.android.install())
             .pipe(this.android.start())
diff --git a/package.json b/package.json
index e3f8c4a..24cf5ec 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gulp-haxetool",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "HaXe Tool for Gulp",
   "main": "index.js",
   "dependencies": {
diff --git a/template/project.xml b/template/project.xml
index b1687d0..1c090a3 100644
--- a/template/project.xml
+++ b/template/project.xml
@@ -23,4 +23,8 @@
     <haxeflag name="-D" value="swf-gpu"/>
     <haxeflag name="-D" value="native-trace"/>
     <haxeflag name="-dce" value="no"/>
+
+    <% android.forEach(function(item) { %>
+    <dependency name="android" path="<%=item.path%>" if="android"/>
+    <% item.extensions.forEach(function(extension) { %><android extension="<%=extension%>"/><% }); %><% }); %>
 </project>