Skip to content

Commit ee8a521

Browse files
committed
feat: use v8 static
1 parent a68b057 commit ee8a521

File tree

9 files changed

+34
-33
lines changed

9 files changed

+34
-33
lines changed

test-app/app/src/main/assets/app/tests/testWebAssembly.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe("Test WebAssembly ", () => {
2323
0x00, 0xaa, 0x0b
2424
]);
2525

26-
xit("Handle compilation failures", done => {
26+
it("Handle compilation failures", done => {
2727
WebAssembly.compile(new Uint8Array([ 1, 2, 3, 4 ])).then(moduleInstance => {
2828
expect(true).toBe(false, "The success callback of the compilation promise was called");
2929
done();
@@ -34,7 +34,7 @@ describe("Test WebAssembly ", () => {
3434
});
3535
});
3636

37-
xit("Compile and instantiate a WebAssembly module asynchronously", done => {
37+
it("Compile and instantiate a WebAssembly module asynchronously", done => {
3838
let importsObj = {
3939
env: {
4040
logarithm: Math.log
@@ -59,7 +59,7 @@ describe("Test WebAssembly ", () => {
5959
});
6060
});
6161

62-
xit("Compile and instantiate a WebAssembly module inside a worker", done => {
62+
it("Compile and instantiate a WebAssembly module inside a worker", done => {
6363
let worker = new Worker("./testWebAssemblyWorker");
6464

6565
worker.onmessage = msg => {

test-app/runtime/CMakeLists.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ endif()
4141
# MESSAGE(STATUS "## Using default linker")
4242
#endif ()
4343

44-
add_library( v8_shared STATIC IMPORTED )
45-
set_target_properties( v8_shared PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8android.so )
44+
#add_library( v8_shared STATIC IMPORTED )
45+
#set_target_properties( v8_shared PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8android.so )
4646

4747
# Command info: https://cmake.org/cmake/help/v3.4/command/include_directories.html
4848
include_directories(
@@ -147,6 +147,7 @@ MESSAGE(STATUS "# CMAKE_CXX_FLAGS: " ${CMAKE_CXX_FLAGS})
147147
# Command info: https://cmake.org/cmake/help/v3.4/command/target_link_libraries.html
148148
# linking v8 and custom STL libraries to the runtime (NativeScript library)
149149
target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libzip.a)
150+
target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_monolith.a)
150151

151152
if("${ANDROID_ABI}" MATCHES "armeabi-v7a$" OR "${ANDROID_ABI}" MATCHES "x86$")
152153
# On API Level 19 and lower we need to link with android_support
@@ -167,4 +168,4 @@ find_library(system-android android)
167168

168169
# Command info: https://cmake.org/cmake/help/v3.4/command/target_link_libraries.html
169170
# Specifies libraries CMake should link to your target library.
170-
target_link_libraries(NativeScript v8_shared ${system-log} ${system-z} ${system-android})
171+
target_link_libraries(NativeScript ${system-log} ${system-z} ${system-android})

0 commit comments

Comments
 (0)