Просмотр исходного кода

fix vprintf in android platform, avoid importing abort in assemblyscript (#210)

Xu Jun 5 лет назад
Родитель
Сommit
8ae161b779
2 измененных файлов с 6 добавлено и 6 удалено
  1. 5 5
      assembly-script/package.json
  2. 1 1
      core/shared/platform/android/platform_init.c

+ 5 - 5
assembly-script/package.json

@@ -5,11 +5,11 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build:request_handler": "asc samples/request_handler.ts -b build/request_handler.wasm -t build/request_handler.wat --sourceMap --validate --optimize",
-    "build:request_sender": "asc samples/request_sender.ts -b build/request_sender.wasm -t build/request_sender.wat --sourceMap --validate --optimize",
-    "build:timer": "asc samples/timer.ts -b build/timer.wasm -t build/timer.wat --sourceMap --validate --optimize",
-    "build:publisher": "asc samples/event_publisher.ts -b build/event_publisher.wasm -t build/event_publisher.wat --sourceMap --validate --optimize",
-    "build:subscriber": "asc samples/event_subscriber.ts -b build/event_subscriber.wasm -t build/event_subscriber.wat --sourceMap --validate --optimize",
+    "build:request_handler": "asc samples/request_handler.ts -b build/request_handler.wasm -t build/request_handler.wat --sourceMap --validate --optimize --use abort=",
+    "build:request_sender": "asc samples/request_sender.ts -b build/request_sender.wasm -t build/request_sender.wat --sourceMap --validate --optimize --use abort=",
+    "build:timer": "asc samples/timer.ts -b build/timer.wasm -t build/timer.wat --sourceMap --validate --optimize --use abort=",
+    "build:publisher": "asc samples/event_publisher.ts -b build/event_publisher.wasm -t build/event_publisher.wat --sourceMap --validate --optimize --use abort=",
+    "build:subscriber": "asc samples/event_subscriber.ts -b build/event_subscriber.wasm -t build/event_subscriber.wat --sourceMap --validate --optimize --use abort=",
     "build:all": "npm run build:request_handler; npm run build:request_sender; npm run build:timer; npm run build:subscriber; npm run build:publisher"
   },
   "author": "",

+ 1 - 1
core/shared/platform/android/platform_init.c

@@ -30,6 +30,6 @@ int os_printf(const char *fmt, ...)
 
 int os_vprintf(const char *fmt, va_list ap)
 {
-    return __android_log_print(ANDROID_LOG_INFO, "wasm_runtime::", fmt, ap);
+    return __android_log_vprint(ANDROID_LOG_INFO, "wasm_runtime::", fmt, ap);
 }