commit ca592dd2cf12206bc3fff80d2ff805a803aabd8e
author Josh Gao <jmgao@google.com> Sat Apr 14 16:47:09 2018 -0700
committer android-build-merger <android-build-merger@google.com> Sat Apr 14 16:47:09 2018 -0700
tree 2a8af0cf40bdb1f8add7bbabe4fa3bfb6b540c8c
parent 630416021e7510efcf4074fc55d83e97c3f494d5
parent 50265355c84cbe49072b16b6c4b212badc79643a

Merge "adb: fix `adb reverse` when adbd has multiple transports." am: 2468b7623c am: c6d6f195d6
am: 50265355c8

Change-Id: I62721a8d4394ba9b776a372537e2541dbd718e7d

lmkd/lmkd.c

diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index 1f16758..d8ad020 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -80,6 +80,9 @@
 /* Defined as ProcessList.SYSTEM_ADJ in ProcessList.java */
 #define SYSTEM_ADJ (-900)
 
+#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
+#define STRINGIFY_INTERNAL(x) #x
+
 /* default to old in-kernel interface if no memory pressure events */
 static bool use_inkernel_interface = true;
 static bool has_inkernel_module;
@@ -585,10 +588,10 @@
 
 #ifdef LMKD_LOG_STATS
 static void memory_stat_parse_line(char *line, struct memory_stat *mem_st) {
-    char key[LINE_MAX];
+    char key[LINE_MAX + 1];
     int64_t value;
 
-    sscanf(line,"%s  %" SCNd64 "", key, &value);
+    sscanf(line, "%" STRINGIFY(LINE_MAX) "s  %" SCNd64 "", key, &value);
 
     if (strcmp(key, "total_") < 0) {
         return;

rootdir/etc/public.libraries.android.txt

diff --git a/rootdir/etc/public.libraries.android.txt b/rootdir/etc/public.libraries.android.txt
index e20b95d..2a51d53 100644
--- a/rootdir/etc/public.libraries.android.txt
+++ b/rootdir/etc/public.libraries.android.txt
@@ -1,6 +1,7 @@
 # See https://android.googlesource.com/platform/ndk/+/master/docs/PlatformApis.md
 libandroid.so
 libaaudio.so
+libamidi.so
 libc.so
 libcamera2ndk.so
 libdl.so

rootdir/etc/public.libraries.wear.txt

diff --git a/rootdir/etc/public.libraries.wear.txt b/rootdir/etc/public.libraries.wear.txt
index 3c46094..56055ba 100644
--- a/rootdir/etc/public.libraries.wear.txt
+++ b/rootdir/etc/public.libraries.wear.txt
@@ -1,6 +1,7 @@
 # See https://android.googlesource.com/platform/ndk/+/master/docs/PlatformApis.md
 libandroid.so
 libaaudio.so
+libamidi.so
 libc.so
 libcamera2ndk.so
 libdl.so