* build-aux/ndk-module-extract.awk: Do not generate newlines in output.

(cherry picked from commit c8473ee8c1914d15fb19207215f0a06c84d0915c)

diff --git a/build-aux/ndk-module-extract.awk b/build-aux/ndk-module-extract.awk
index 6ff30973d671bb920b438f671e1bf8be47390c46..b57bf74001d363e7c0fc2fab6ef5d7c24f8fe433 100644 (file)
--- a/build-aux/ndk-module-extract.awk
+++ b/build-aux/ndk-module-extract.awk
@@ -55,14 +55,14 @@
 /^End$/ {
   if (name == MODULE && (kind == "shared" || kind == "static"))
     {
-      printf "module_name=%s\n", name
-      printf "module_kind=%s\n", kind
-      printf "module_src=\"%s\"\n", src
-      printf "module_includes=\"%s\"\n", includes
-      printf "module_cflags=\"%s\"\n", cflags
-      printf "module_ldflags=\"%s\"\n", ldflags
-      printf "module_target=\"%s\"\n", target
-      printf "module_cxx_deps=\"%s\"\n", cxx_deps
+      printf "module_name=%s;", name
+      printf "module_kind=%s;", kind
+      printf "module_src=\"%s\";", src
+      printf "module_includes=\"%s\";", includes
+      printf "module_cflags=\"%s\";", cflags
+      printf "module_ldflags=\"%s\";", ldflags
+      printf "module_target=\"%s\";", target
+      printf "module_cxx_deps=\"%s\";", cxx_deps
     }
 
   src = ""
@@ -83,6 +83,6 @@
   imports = ""
   # Strip off leading whitespace.
   gsub (/^[ \t]+/, "", makefile_imports)
-  printf "module_imports=\"%s\"\n", makefile_imports
+  printf "module_imports=\"%s\";", makefile_imports
   makefile_imports = ""
 }