mirror of
https://github.com/apache/cordova-android.git
synced 2025-01-31 17:32:51 +08:00
CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit)
This commit is contained in:
parent
a5d300c6ff
commit
ac34bf1e54
12
bin/templates/cordova/lib/build.js
vendored
12
bin/templates/cordova/lib/build.js
vendored
@ -155,7 +155,6 @@ var builders = {
|
|||||||
process.exit(2);
|
process.exit(2);
|
||||||
}
|
}
|
||||||
var ret = candidates[0];
|
var ret = candidates[0];
|
||||||
console.log('Using apk: ' + ret);
|
|
||||||
return [ret];
|
return [ret];
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -256,9 +255,7 @@ var builders = {
|
|||||||
}
|
}
|
||||||
return path.extname(candidate) == '.apk';
|
return path.extname(candidate) == '.apk';
|
||||||
});
|
});
|
||||||
var ret = candidates[0];
|
return candidates;
|
||||||
console.log('Using apk: ' + ret);
|
|
||||||
return [ret];
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -343,9 +340,14 @@ module.exports.run = function(options) {
|
|||||||
// are used by get_apk().
|
// are used by get_apk().
|
||||||
var outputDir = path.join(ROOT, 'out');
|
var outputDir = path.join(ROOT, 'out');
|
||||||
shell.mkdir('-p', outputDir);
|
shell.mkdir('-p', outputDir);
|
||||||
|
var builtApks = [];
|
||||||
for (var i=0; i < apkFiles.length; ++i) {
|
for (var i=0; i < apkFiles.length; ++i) {
|
||||||
shell.cp('-f', apkFiles[i], path.join(outputDir, path.basename(apkFiles[i])));
|
var dst = path.join(outputDir, path.basename(apkFiles[i]));
|
||||||
|
builtApks.push(dst);
|
||||||
|
shell.cp('-f', apkFiles[i], dst);
|
||||||
}
|
}
|
||||||
|
console.log('Built the following APKs:\n' + builtApks.join('\n'));
|
||||||
|
return builtApks;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user