commit 8ba86320a71bcdc7b411070c0c0f101cf2131cf2
author Bill Yi <byi@google.com> Wed Oct 24 14:46:02 2018 -0700
committer Bill Yi <byi@google.com> Wed Oct 24 14:46:02 2018 -0700
tree a4c85d4421843d6131f2987a034b4ae688119201
parent 9ed960a358e4606d761779d772dad39cb08513dd
parent e8fd6a87d14ddf46f99821fa0a9f0100ccaff636

Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I01bcb6072e58348c5f91b0cc1d8de1941f9e8847

Android.bp

diff --git a/Android.bp b/Android.bp
index cb527c5..5f54695 100644
--- a/Android.bp
+++ b/Android.bp
@@ -414,8 +414,6 @@
 
     export_include_dirs: ["include"],
 
-    shared_libs: ["liblzma"],
-
     debug: {
         //shared_libs: ["liblog"],
     },

include/config.h

diff --git a/include/config.h b/include/config.h
index 48549f6..bcef953 100644
--- a/include/config.h
+++ b/include/config.h
@@ -131,7 +131,7 @@
 #define HAVE_LINK_H 1
 
 /* Define if you have liblzma */
-#define HAVE_LZMA 1
+/* #undef HAVE_LZMA */
 
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1

src/os-linux.c

diff --git a/src/os-linux.c b/src/os-linux.c
index 8dc1ebf..0f914f2 100644
--- a/src/os-linux.c
+++ b/src/os-linux.c
@@ -78,6 +78,7 @@
       /* If this is a readable executable map, and not a stack map or an
          empty map, find the load_base.  */
       if (cur_map->path[0] != '\0' && strncmp ("[stack:", cur_map->path, 7) != 0
+          && strncmp ("[vsyscall]", cur_map->path, 10) != 0
           && (flags & (PROT_EXEC | PROT_READ)) == (PROT_EXEC | PROT_READ)
           && !(cur_map->flags & MAP_FLAGS_DEVICE_MEM))
         {