quickjs-tart

commit 755bdfca1b330bf3edc5901bc78dbb446fdaeec0
parent cb885f4c956e2d6ea4c4af5c71a0e4ec998e427a
Author: Florian Dold <florian@dold.me>
Date:   Thu,  9 Feb 2023 23:22:09 +0100

android: higher optimization level, only sign when required

Diffstat:
M
QuickJS-android/.idea/misc.xml
 | 
2
+-
M
QuickJS-android/qtart/build.gradle.kts
 | 
7
++++++-
M
cross/build-android.sh
 | 
4
++++
M
taler_wallet_core_lib.c
 | 
5
+++--

4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/QuickJS-android/.idea/misc.xml b/QuickJS-android/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/QuickJS-android/qtart/build.gradle.kts b/QuickJS-android/qtart/build.gradle.kts
@@ -32,7 +32,12 @@ dependencies {
 }
 
 signing {
-    isRequired = System.getenv().containsKey("MAVEN_PUBLISH")
+    useGpgCmd()
+}
+
+// Only sign when MAVEN_PUBLISH is set in the environment
+tasks.withType<Sign>().configureEach {
+    onlyIf { System.getenv().containsKey("MAVEN_PUBLISH") as Boolean }
 }
 
 extensions.getByType<MavenPublishPluginExtension>().apply {
diff --git a/cross/build-android.sh b/cross/build-android.sh
@@ -91,7 +91,11 @@ cpu = '$CPU'
 endian = 'little'
 EOF
 
+export LDFLAGS=-flto
+export CFLAGS=-flto
+
 meson setup --errorlogs  \
+  -Doptimization=3 \
   --prefix=${ANDROID_NDK_HOME} \
   --includedir=${INC_PATH} \
   --libdir=${LIB_PATH} \
diff --git a/taler_wallet_core_lib.c b/taler_wallet_core_lib.c
@@ -152,8 +152,10 @@ run(void *cls)
 
     js_std_add_helpers(wh->ctx, 0, NULL);
 
+    fprintf(stderr, "qtart: loading JS code\n");
     js_std_eval_binary(wh->ctx, qjsc_prelude, qjsc_prelude_size, 0);
     js_std_eval_binary(wh->ctx, qjsc_wallet_core, qjsc_wallet_core_size, 0);
+    fprintf(stderr, "qtart: done loading JS code\n");
 
     js_os_set_host_message_handler(wh->ctx, wallet_host_message_handler, wh);
 
@@ -266,4 +268,4 @@ TALER_start_redirect_std(TALER_LogFn logfn, void *cls)
     }
     pthread_detach(log_thr);
     return 0;
-}
-\ No newline at end of file
+}