Skip to content

Commit

Permalink
Merge pull request #17 from NativeScript/darind/x86_64
Browse files Browse the repository at this point in the history
Added x86_64 architecture
  • Loading branch information
darind authored Aug 20, 2019
2 parents b0aa033 + c754fda commit 5a73e80
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 2 additions & 3 deletions build.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
diff --git a/config/android/BUILD.gn b/config/android/BUILD.gn
index b69d42b70..7a6c15d1b 100644
index 233e8b0e7..bac05fa19 100644
--- a/config/android/BUILD.gn
+++ b/config/android/BUILD.gn
@@ -117,7 +117,9 @@ config("runtime_library") {
lib_dirs = [ android_libcpp_lib_dir ]

libs = []
- libs += [ "android_support" ]
+ if (current_cpu != "arm64") {
+ if (current_cpu != "arm64" && current_cpu != "x64") {
+ libs += [ "android_support" ]
+ }

# arm builds of libc++ starting in NDK r12 depend on unwind.
if (current_cpu == "arm") {

6 changes: 5 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ esac

# The order of CPU architectures in this array must be the same
# as the order of NDK tools in the NDK_BUILD_TOOLS_ARR array
ARCH_ARR=(arm arm64 x86)
ARCH_ARR=(arm arm64 x86 x64)

BUILD_DIR_PREFIX="outgn"

Expand Down Expand Up @@ -110,6 +110,8 @@ do
SOURCE_DIR=$BUILD_DIR_PREFIX/$SNAPSHOT_PREFIX$CURRENT_ARCH-$BUILD_TYPE/clang_x86_v8_$CURRENT_ARCH
elif [[ $CURRENT_ARCH == "x86" ]] ;then
SOURCE_DIR=$BUILD_DIR_PREFIX/$SNAPSHOT_PREFIX$CURRENT_ARCH-$BUILD_TYPE/clang_x86
elif [[ $CURRENT_ARCH == "x64" ]] ;then
SOURCE_DIR=$BUILD_DIR_PREFIX/$SNAPSHOT_PREFIX$CURRENT_ARCH-$BUILD_TYPE/clang_x64
fi

cp -r $SOURCE_DIR/mksnapshot $DIST
Expand All @@ -130,6 +132,8 @@ do
SOURCE_DIR=$BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE/clang_x86_v8_$CURRENT_ARCH
elif [[ $CURRENT_ARCH == "x86" ]] ;then
SOURCE_DIR=$BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE/clang_x86
elif [[ $CURRENT_ARCH == "x64" ]] ;then
SOURCE_DIR=$BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE/clang_x64
fi

pushd $SOURCE_DIR/..
Expand Down

0 comments on commit 5a73e80

Please sign in to comment.