[FIX] [dbgen] [meta]: use host static library, use

0xf104a · May 3, 2024 · 2a20dc8 · 2a20dc8
1 parent 09029a3
commit 2a20dc8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/dbgen/Android.bp b/dbgen/Android.bp
@@ -5,7 +5,7 @@ cc_binary_host {
     ],
     local_include_dirs: ["."],
     include_dirs: ["external/Valor/libvalor/include"],
-    static_libs: ["libvalor"],
+    static_libs: ["libvalor_host"],
     cflags: ["-Wall", "-Wextra"],
     target: {
         host: {

diff --git a/dbgen/src/message.h b/dbgen/src/message.h
@@ -42,12 +42,10 @@
 #define PRINT_FORMATTED(STYLE) \
 va_list args;              \
 va_start(args, format);    \
-flockfile(stdout);         \
 printf("\33[2K");          \
 printf(STYLE);             \
 vprintf(format, args);     \
 printf("\n");              \
-funlockfile(stdout);       \
 va_end(args)
 
 #define PRINT_FORMATTED_NO_NEWLINE(STYLE) \

diff --git a/libvalor/Android.bp b/libvalor/Android.bp
@@ -3,6 +3,18 @@ cc_library {
     srcs: ["src/**/*.c"],
     local_include_dirs: ["include"],
 
+    target: {
+       host: {
+          enabled: true
+      }
+    }
+}
+
+cc_library_host_static {
+    name: "libvalor",
+    srcs: ["src/**/*.c"],
+    local_include_dirs: ["include"],
+
     target: {
        host: {
           enabled: true

diff --git a/libvalor/src/hashtable.c b/libvalor/src/hashtable.c
@@ -43,7 +43,7 @@ hashtable_t *hashtbl_create(size_t capacity) {
     _tbl->base = (hashtable_node **) malloc(sizeof(hashtable_node * ) * capacity);
     _tbl->keys = array_create(1);
     _tbl->values = array_create(1);
-    bzero(_tbl->base, capacity * sizeof(hashtable_node *));
+    memset(_tbl->base, 0, capacity * sizeof(hashtable_node *));
     return _tbl;
 }