Skip to content

Commit

Permalink
Adapt to x86_64 build.
Browse files Browse the repository at this point in the history
  • Loading branch information
fdgonthier committed Jan 29, 2018
1 parent c6b2088 commit 8789011
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Android.mk
Expand Up @@ -9,5 +9,5 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/bin

LOCAL_POST_INSTALL_CMD := \
mkdir -p $(TARGET_OUT)/Osys/FE; \
cp -af $(LOCAL_PATH)/dist_arm64/* $(TARGET_OUT)/Osys/FE
cp -af $(LOCAL_PATH)/dist_$(TARGET_ARCH)/* $(TARGET_OUT)/Osys/FE
include $(BUILD_PREBUILT)
7 changes: 5 additions & 2 deletions Gruntfile.js
Expand Up @@ -36,7 +36,7 @@ module.exports = function (grunt) {
pkg: grunt.file.readJSON("package.json")
});

_.each(["arm", "arm64", "ia32"], function (arch) {
_.each(["arm", "arm64", "ia32", "x86_64"], function (arch) {
var mkdist = function (arch) {
return function () {
var args = Array.prototype.slice.call(arguments);
Expand Down Expand Up @@ -246,7 +246,10 @@ module.exports = function (grunt) {
grunt.loadNpmTasks("grunt-contrib-concat");
grunt.loadNpmTasks("grunt-contrib-pug");

grunt.registerTask("oreo", ["dist_arm64"]);
grunt.registerTask("arm64", ["dist_arm64"]);
grunt.registerTask("arm", ["dist_arm"]);
grunt.registerTask("ia32", ["dist_ia32"]);
grunt.registerTask("x86_64", ["dist_x86_64"]);
};


5 changes: 5 additions & 0 deletions package.json
Expand Up @@ -7,6 +7,11 @@
},
"prebuilts": {
"modules": {
"x86_64": [
"https://github.com/fdgonthier/pwd/releases/download/1.1.0/pwd2-1.1.0_x86_64.tar.gz",
"https://github.com/fdgonthier/node-inotify/releases/download/v1.4.2/inotify-1.4.2_x86_64.tar.gz",
"https://github.com/fdgonthier/node-abstractsocket/releases/download/v2.0.0/abstract-socket-2.0.0_x86_64.tar.gz"
],
"ia32": [
"https://github.com/fdgonthier/pwd/releases/download/1.1.0/pwd2-1.1.0_ia32.tar.gz",
"https://github.com/fdgonthier/node-inotify/releases/download/v1.4.2/inotify-1.4.2_ia32.tar.gz",
Expand Down

0 comments on commit 8789011

Please sign in to comment.