From 29e5cc131c2993910fc0f072812c80e2736113d3 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sat, 7 Apr 2018 22:43:22 +0800 Subject: [PATCH 01/31] add docker image --- Dockerfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..409f8df --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM gengjiawen/android-ndk + +RUN apt-get install subversion gperf git ant python2 -y \ + +#install buck +RUN git clone https://github.com/facebook/buck.git && \ + cd buck && \ + ant && \ + ln ./bin/buck /usr/bin ** \ + buck --version + + From f41d138cf4981d112fc01f950607b7a3056f0e50 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sat, 7 Apr 2018 22:52:02 +0800 Subject: [PATCH 02/31] add circle ci --- circle.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..a117ea7 --- /dev/null +++ b/circle.yml @@ -0,0 +1,13 @@ +version: 2 +jobs: + build: + working_directory: ~/android-jsc + docker: + - image: gengjiawen/android-jsc + steps: + - build + - run: + name: Setup NDK + command: | + ./fetch_sources.sh + buck build :android-jsc From fc7e994fc0169cdb0134cb3fa522a391510fa465 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sat, 7 Apr 2018 23:15:38 +0800 Subject: [PATCH 03/31] update docker --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 409f8df..eae3709 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM gengjiawen/android-ndk -RUN apt-get install subversion gperf git ant python2 -y \ +RUN apt-get install subversion gperf git ant python-dev -y \ #install buck RUN git clone https://github.com/facebook/buck.git && \ From 9e66e4e2b9dac12de90eaa39a4e21e9b76956038 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sat, 7 Apr 2018 23:25:04 +0800 Subject: [PATCH 04/31] update git ignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 9ac924f..5cf0a28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +.idea +*.iml +gen buck-out/ .buckd/ icu From e1f535f35ad1703ca44e98de2a10f18b1f762549 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sat, 7 Apr 2018 23:35:11 +0800 Subject: [PATCH 05/31] update docker --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index eae3709..2cbe888 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ FROM gengjiawen/android-ndk -RUN apt-get install subversion gperf git ant python-dev -y \ +RUN apt-get install subversion gperf git ant python-dev -y #install buck -RUN git clone https://github.com/facebook/buck.git && \ +RUN git clone "https://github.com/facebook/buck.git" && \ cd buck && \ ant && \ ln ./bin/buck /usr/bin ** \ From dc3400c9ad86452ae8899adeaf438480b815696a Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sat, 7 Apr 2018 23:39:54 +0800 Subject: [PATCH 06/31] update docker again --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2cbe888..a485263 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,8 @@ RUN apt-get install subversion gperf git ant python-dev -y RUN git clone "https://github.com/facebook/buck.git" && \ cd buck && \ ant && \ - ln ./bin/buck /usr/bin ** \ - buck --version + ln ./bin/buck /usr/bin && \ + buck --version && \ + git clone "https://github.com/WebKit/webkit" From a37f7206d89505083ea5f6892a0d6a7a38ea1cae Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 09:04:59 +0800 Subject: [PATCH 07/31] update docker again --- Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index a485263..e5cf8b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,10 @@ FROM gengjiawen/android-ndk -RUN apt-get install subversion gperf git ant python-dev -y +RUN apt-get install git ant python-dev -y #install buck -RUN git clone "https://github.com/facebook/buck.git" && \ - cd buck && \ - ant && \ - ln ./bin/buck /usr/bin && \ +RUN wget "https://github.com/facebook/buck/releases/download/v2018.03.26.01/buck_2018.03.26_all.deb" && \ + dpkg -i buck_2018.03.26_all.deb && \ buck --version && \ git clone "https://github.com/WebKit/webkit" From 83ba9b4fda0a1ce800508544216cc766c5b6a297 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 09:05:26 +0800 Subject: [PATCH 08/31] fix add source --- fetch_sources.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fetch_sources.sh b/fetch_sources.sh index b0b584d..7605936 100755 --- a/fetch_sources.sh +++ b/fetch_sources.sh @@ -12,9 +12,6 @@ curl -o icu4c.tar.gz https://android.googlesource.com/platform/external/icu/+arc echo "Extracting ICU" tar -zxf icu4c.tar.gz -C icu -echo "Downloading JSC" -curl -O https://builds-nightly.webkit.org/files/trunk/src/WebKit-r174650.tar.bz2 - -echo "Extracting JSC" -tar -jxf WebKit-r174650.tar.bz2 -C jsc --strip 2 WebKit-r174650/Source/JavaScriptCore WebKit-r174650/Source/WTF +echo "set JSC" +cp -r ~/webkit/Source/JavaScriptCore WebKit-r174650/Source/WTF From 03a52a2f9417def1f700c364a745721018d84be0 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 11:09:31 +0800 Subject: [PATCH 09/31] fix name --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index a117ea7..0d9d69a 100644 --- a/circle.yml +++ b/circle.yml @@ -7,7 +7,7 @@ jobs: steps: - build - run: - name: Setup NDK + name: build aar command: | ./fetch_sources.sh buck build :android-jsc From 1a9227f5c9855d0c501c7faba2c7e870417f03f3 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 11:12:09 +0800 Subject: [PATCH 10/31] fix ci --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index 0d9d69a..72009d9 100644 --- a/circle.yml +++ b/circle.yml @@ -5,7 +5,6 @@ jobs: docker: - image: gengjiawen/android-jsc steps: - - build - run: name: build aar command: | From 1f475ce73c4b1db81dd9a8c2c7ea88503dcf7f59 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 11:14:26 +0800 Subject: [PATCH 11/31] fix ci --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 72009d9..4453aec 100644 --- a/circle.yml +++ b/circle.yml @@ -3,7 +3,7 @@ jobs: build: working_directory: ~/android-jsc docker: - - image: gengjiawen/android-jsc + - image: gengjiawen/android-jsc:feature_abi_support steps: - run: name: build aar From 87eb0428007738be48d6bfa502107512a27d35fa Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 11:37:10 +0800 Subject: [PATCH 12/31] add missing checkout --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 4453aec..5e3bc36 100644 --- a/circle.yml +++ b/circle.yml @@ -5,6 +5,7 @@ jobs: docker: - image: gengjiawen/android-jsc:feature_abi_support steps: + - checkout - run: name: build aar command: | From 14525b92d66370c04cd857624de89ca24e564b36 Mon Sep 17 00:00:00 2001 From: leeight Date: Fri, 7 Oct 2016 09:33:18 +0800 Subject: [PATCH 13/31] Add x86_64 support (cherry picked from commit ee6e7e3) --- .buckconfig | 17 ++++++++++++++++- jsc/BUCK | 18 +++--------------- jsc/extra_headers/LLIntAssembly.h | 4 ++++ 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.buckconfig b/.buckconfig index cf83d21..5506231 100644 --- a/.buckconfig +++ b/.buckconfig @@ -1,7 +1,10 @@ [buildfile] includes = //BUILD_DEFS [ndk] - ndk_version = r10c + ndk_version = r10e + cpu_abis = armv7, x86, x86_64 + gcc_version = 4.9 + app_platform = android-21 cppflags = \ -std=gnu11 \ -Wall \ @@ -88,6 +91,18 @@ -mfloat-abi=softfp \ -mthumb \ -Os + x86_64_cppflags = \ + -O2 + x86_64_cflags = \ + -funswitch-loops \ + -finline-limit=300 \ + -O2 + x86_64_cxxppflags = \ + -O2 + x86_64_cxxflags = \ + -funswitch-loops \ + -finline-limit=300 \ + -O2 x86_cppflags = \ -O2 x86_cflags = \ diff --git a/jsc/BUCK b/jsc/BUCK index f033522..a6bd46a 100644 --- a/jsc/BUCK +++ b/jsc/BUCK @@ -2,7 +2,7 @@ import os -SUPPORTED_PLATFORMS = '^android-(armv7|x86)$' +SUPPORTED_PLATFORMS = '^android-(armv7|x86|x86_64)$' def unpack_rule(source, from_rule): genrule( @@ -26,19 +26,6 @@ WTF_EXPORTED_PREPROCESSOR_FLAGS = [ '-DENABLE_GLOBAL_FASTMALLOC_NEW=0', ] -# Dirty hack, StdLibExtras.h assumes incorrectly that is_trivially_destructible -# have been added in 4.8.1 version while it was added in 4.8.0. We emulate PATCH -# version to be 1 so that StdLibExtra.h doesn't try to declare -# is_trivially_destructible -# Except from this single place JSC code doesn't check for 4.8.1 anywhere else -WTF_EXPORTED_PREPROCESSOR_FLAGS.extend([ - '-U__GNUC_PATCHLEVEL__', - '-D__GNUC_PATCHLEVEL__=1', - '-DPTHREAD_KEYS_MAX=1024', - '-DINTPTR_MAX=LONG_MAX', - '-Dlog2(x)=(log(x)/log(2.0))', -]) - cxx_library( name = 'wtfassertions', force_static = True, @@ -165,6 +152,7 @@ cxx_library( supported_platforms_regex = SUPPORTED_PLATFORMS, header_namespace = '', headers = subdir_glob([ + ('WTF', '*.h'), ('WTF/wtf', '*.h'), ('', 'extra_headers/*.h'), ]), @@ -936,7 +924,7 @@ SOURCES = glob([ 'JavaScriptCore/*.asm', ]) SOURCES.append(':InitBytecodes.asm') -for platform in ('android-armv7', 'android-x86'): +for platform in ('android-armv7', 'android-x86', 'android-x86_64'): source = 'LLIntAssembly.{0}.h'.format(platform) genrule( name = source, diff --git a/jsc/extra_headers/LLIntAssembly.h b/jsc/extra_headers/LLIntAssembly.h index 4673d9e..ec2f4c4 100644 --- a/jsc/extra_headers/LLIntAssembly.h +++ b/jsc/extra_headers/LLIntAssembly.h @@ -4,6 +4,10 @@ #include "LLIntAssembly.android-armv7.h" #elif defined(__ANDROID__) && defined(__i386__) #include "LLIntAssembly.android-x86.h" +#elif defined(__ANDROID__) && defined(__x86_64__) +#include "LLIntAssembly.android-x86_64.h" +#elif defined(__ANDROID__) && defined(__aarch64__) +#include "LLIntAssembly.android-arm64.h" #else #error "Platform not supported" #endif From 57bf0914a01419ef6961668cb9c13bfbe5a4b81e Mon Sep 17 00:00:00 2001 From: leeight Date: Mon, 10 Oct 2016 15:54:39 +0800 Subject: [PATCH 14/31] Add arm64 (cherry picked from commit 336b3a4) --- .buckconfig | 2 +- jsc/BUCK | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.buckconfig b/.buckconfig index 5506231..6f6fb99 100644 --- a/.buckconfig +++ b/.buckconfig @@ -2,7 +2,7 @@ includes = //BUILD_DEFS [ndk] ndk_version = r10e - cpu_abis = armv7, x86, x86_64 + cpu_abis = armv7, arm64, x86, x86_64 gcc_version = 4.9 app_platform = android-21 cppflags = \ diff --git a/jsc/BUCK b/jsc/BUCK index a6bd46a..40b3259 100644 --- a/jsc/BUCK +++ b/jsc/BUCK @@ -2,7 +2,7 @@ import os -SUPPORTED_PLATFORMS = '^android-(armv7|x86|x86_64)$' +SUPPORTED_PLATFORMS = '^android-(armv7|arm64|x86|x86_64)$' def unpack_rule(source, from_rule): genrule( @@ -924,7 +924,7 @@ SOURCES = glob([ 'JavaScriptCore/*.asm', ]) SOURCES.append(':InitBytecodes.asm') -for platform in ('android-armv7', 'android-x86', 'android-x86_64'): +for platform in ('android-armv7', 'android-arm64', 'android-x86', 'android-x86_64'): source = 'LLIntAssembly.{0}.h'.format(platform) genrule( name = source, From a86e260d0fafaa30a8663a162068819c18a08507 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 11:44:23 +0800 Subject: [PATCH 15/31] change ndk version --- .buckconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.buckconfig b/.buckconfig index 6f6fb99..d50c2e5 100644 --- a/.buckconfig +++ b/.buckconfig @@ -1,10 +1,8 @@ [buildfile] includes = //BUILD_DEFS [ndk] - ndk_version = r10e + ndk_version = 16.1.4479499 cpu_abis = armv7, arm64, x86, x86_64 - gcc_version = 4.9 - app_platform = android-21 cppflags = \ -std=gnu11 \ -Wall \ From 38dd6771efa1b68e7bfdb6ec175371a44990525e Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 11:52:09 +0800 Subject: [PATCH 16/31] fix source --- fetch_sources.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fetch_sources.sh b/fetch_sources.sh index 7605936..78de79a 100755 --- a/fetch_sources.sh +++ b/fetch_sources.sh @@ -13,5 +13,6 @@ echo "Extracting ICU" tar -zxf icu4c.tar.gz -C icu echo "set JSC" -cp -r ~/webkit/Source/JavaScriptCore WebKit-r174650/Source/WTF +cp -r ~/webkit/Source/JavaScriptCore jsc +cp -r ~/webkit/Source/WTF jsc From 7adb0dea41f028050eb16d17146d6db18735e2e9 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 12:00:09 +0800 Subject: [PATCH 17/31] fix path --- fetch_sources.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fetch_sources.sh b/fetch_sources.sh index 78de79a..0aa1324 100755 --- a/fetch_sources.sh +++ b/fetch_sources.sh @@ -13,6 +13,6 @@ echo "Extracting ICU" tar -zxf icu4c.tar.gz -C icu echo "set JSC" -cp -r ~/webkit/Source/JavaScriptCore jsc -cp -r ~/webkit/Source/WTF jsc +cp -r /webkit/Source/JavaScriptCore jsc +cp -r /webkit/Source/WTF jsc From 48369c0fa485992deb8f712ab1b2e1c57f3acd77 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 14:49:21 +0800 Subject: [PATCH 18/31] switch back to svn --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e5cf8b6..4d6c904 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ FROM gengjiawen/android-ndk -RUN apt-get install git ant python-dev -y +RUN apt-get install git ant python-dev subversion -y #install buck RUN wget "https://github.com/facebook/buck/releases/download/v2018.03.26.01/buck_2018.03.26_all.deb" && \ dpkg -i buck_2018.03.26_all.deb && \ buck --version && \ - git clone "https://github.com/WebKit/webkit" + svn export https://svn.webkit.org/repository/webkit/trunk/@174650 From e66907a6b153dd14a250df1bfb572572b9e824d2 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 15:31:42 +0800 Subject: [PATCH 19/31] fix path --- fetch_sources.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fetch_sources.sh b/fetch_sources.sh index 0aa1324..77bd885 100755 --- a/fetch_sources.sh +++ b/fetch_sources.sh @@ -13,6 +13,6 @@ echo "Extracting ICU" tar -zxf icu4c.tar.gz -C icu echo "set JSC" -cp -r /webkit/Source/JavaScriptCore jsc -cp -r /webkit/Source/WTF jsc +cp -r /trunk/Source/JavaScriptCore jsc +cp -r /trunk/Source/WTF jsc From 0f0cda0428dc439ad5e489b7606640a783e3ddcc Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 16:32:13 +0800 Subject: [PATCH 20/31] update dockerfile --- Dockerfile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4d6c904..6a1b23a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,23 @@ FROM gengjiawen/android-ndk +# use old ndk +ENV ANDROID_NDK_HOME /opt/android-ndk +ENV ANDROID_NDK_VERSION r10e +RUN rm -rf ${ANDROID_HOME}/ndk-bundle + +RUN mkdir /opt/android-ndk-tmp && \ + cd /opt/android-ndk-tmp && \ + wget -q https://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.zip && \ + unzip -q android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.zip && \ + mv ./android-ndk-${ANDROID_NDK_VERSION} ${ANDROID_NDK_HOME} && \ + cd ${ANDROID_NDK_HOME} && \ + rm -rf /opt/android-ndk-tmp + +ENV PATH ${ANDROID_NDK_HOME}:$PATH + RUN apt-get install git ant python-dev subversion -y -#install buck +#install buck and checkout jsc RUN wget "https://github.com/facebook/buck/releases/download/v2018.03.26.01/buck_2018.03.26_all.deb" && \ dpkg -i buck_2018.03.26_all.deb && \ buck --version && \ From f2049ff247514d0e14d6a7a3c6c54cfcf6549146 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 18:07:10 +0800 Subject: [PATCH 21/31] fix buck build --- .buckconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.buckconfig b/.buckconfig index d50c2e5..7cfde96 100644 --- a/.buckconfig +++ b/.buckconfig @@ -1,8 +1,9 @@ [buildfile] includes = //BUILD_DEFS [ndk] - ndk_version = 16.1.4479499 cpu_abis = armv7, arm64, x86, x86_64 + gcc_version = 4.9 + app_platform = android-21 cppflags = \ -std=gnu11 \ -Wall \ From d8b63051806be3af4897070b68d6aeff4678406b Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 18:19:35 +0800 Subject: [PATCH 22/31] add more env --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 6a1b23a..fba708b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,8 @@ FROM gengjiawen/android-ndk # use old ndk ENV ANDROID_NDK_HOME /opt/android-ndk +ENV ANDROID_NDK /opt/android-ndk +ENV NDK_HOME /opt/android-ndk ENV ANDROID_NDK_VERSION r10e RUN rm -rf ${ANDROID_HOME}/ndk-bundle From 1f5fdeb642a1db66077fbb6d3288c681034ac965 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 18:20:44 +0800 Subject: [PATCH 23/31] explicit add env --- circle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circle.yml b/circle.yml index 5e3bc36..c3618ed 100644 --- a/circle.yml +++ b/circle.yml @@ -4,6 +4,8 @@ jobs: working_directory: ~/android-jsc docker: - image: gengjiawen/android-jsc:feature_abi_support + environment: + - ANDROID_NDK: '/opt/android-ndk' steps: - checkout - run: From 9487ee038590a1b0184e4be682f71542cf6c08ef Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 18:24:48 +0800 Subject: [PATCH 24/31] add more package --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fba708b..b2fb40e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN mkdir /opt/android-ndk-tmp && \ ENV PATH ${ANDROID_NDK_HOME}:$PATH -RUN apt-get install git ant python-dev subversion -y +RUN apt-get install git ant python-dev ruby zip subversion -y #install buck and checkout jsc RUN wget "https://github.com/facebook/buck/releases/download/v2018.03.26.01/buck_2018.03.26_all.deb" && \ From 0683c214ff626d7cdc31ccd0040d73ddea4bb76f Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Sun, 8 Apr 2018 19:17:31 +0800 Subject: [PATCH 25/31] add java options for memory issue --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index c3618ed..5f8e66d 100644 --- a/circle.yml +++ b/circle.yml @@ -6,6 +6,7 @@ jobs: - image: gengjiawen/android-jsc:feature_abi_support environment: - ANDROID_NDK: '/opt/android-ndk' + - _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap" steps: - checkout - run: From 9961cbbac4416ca7c059f227e81f9c494007d296 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Mon, 9 Apr 2018 08:20:20 +0800 Subject: [PATCH 26/31] add travis ci --- .travis.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..b3fc7d8 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,14 @@ +dist: trusty +sudo: required +env: + global: + - _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap" + +language: c + +services: + - docker + +script: +- docker run --name hei gengjiawen/android-jsc:feature_abi_support /bin/sh -c "./fetch_sources.sh && buck build :android-jsc" + From 8412048bc82522c422e1e0a34576b655a88f31c2 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Mon, 9 Apr 2018 08:35:51 +0800 Subject: [PATCH 27/31] add pwd --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b3fc7d8..db9c1ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ services: - docker script: -- docker run --name hei gengjiawen/android-jsc:feature_abi_support /bin/sh -c "./fetch_sources.sh && buck build :android-jsc" +- docker run --name hei $PWD:/pwd gengjiawen/android-jsc:feature_abi_support /bin/sh -c "./fetch_sources.sh && buck build :android-jsc" From 1d28c39dc1cc4b48e88c5396bf677b7384da3cd0 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Mon, 9 Apr 2018 08:46:02 +0800 Subject: [PATCH 28/31] fix pwd --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index db9c1ae..e8c5fe3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ services: - docker script: -- docker run --name hei $PWD:/pwd gengjiawen/android-jsc:feature_abi_support /bin/sh -c "./fetch_sources.sh && buck build :android-jsc" +- docker run --name hei $PWD:/pwd -w /pwd gengjiawen/android-jsc:feature_abi_support /bin/sh -c "./fetch_sources.sh && buck build :android-jsc" From b99b0ef47729362147d5801b7ff77d39b74fc99c Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Mon, 9 Apr 2018 08:48:38 +0800 Subject: [PATCH 29/31] fix pwd --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e8c5fe3..e53df5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ services: - docker script: -- docker run --name hei $PWD:/pwd -w /pwd gengjiawen/android-jsc:feature_abi_support /bin/sh -c "./fetch_sources.sh && buck build :android-jsc" +- docker run --name hei $PWD:/root gengjiawen/android-jsc:feature_abi_support /bin/sh -c "./fetch_sources.sh && buck build :android-jsc" From 53d27707fb9432fcf359a535049a0e5a3820151d Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Mon, 9 Apr 2018 15:53:40 +0800 Subject: [PATCH 30/31] fix build script --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e53df5a..dcbed10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ services: - docker script: -- docker run --name hei $PWD:/root gengjiawen/android-jsc:feature_abi_support /bin/sh -c "./fetch_sources.sh && buck build :android-jsc" +- docker run --rm --name hei -v $PWD:/pwd -w /pwd gengjiawen/android-jsc:feature_abi_support /bin/sh -c "./fetch_sources.sh && buck build :android-jsc" From 9560d9a837317d787b4e3dc6924cfbaf87cc156a Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Mon, 9 Apr 2018 16:29:16 +0800 Subject: [PATCH 31/31] add wait --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dcbed10..1a5a876 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ services: - docker script: -- docker run --rm --name hei -v $PWD:/pwd -w /pwd gengjiawen/android-jsc:feature_abi_support /bin/sh -c "./fetch_sources.sh && buck build :android-jsc" +- travis_wait 60 docker run --rm --name hei -v $PWD:/pwd -w /pwd gengjiawen/android-jsc:feature_abi_support /bin/sh -c "./fetch_sources.sh && buck build :android-jsc"