commit e145aae9499dbd5b1f2712cae1eaa3b4ddcbff7f
author Victor Khimenko <khim@google.com> Fri May 15 13:30:22 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 15 13:30:22 2020 +0000
tree 65eb5207ffd0267887cc5c1ae0fea0c540de3e1d
parent 6972d40571c9e2f838fd300c312e0b07835b1e90
parent d15229df76e78337532c19d42c01b2c51db8f2f1

Merge "Copy translateSystemPathToApexPath to linker_translate_path.cpp"

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index f6820d1..8c8853f 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -37,3 +37,28 @@
     key: "com.android.runtime.key",
     certificate: ":com.android.runtime.certificate",
 }
+
+sdk {
+    name: "runtime-module-sdk",
+    defaults: ["linux_bionic_supported"],
+
+    native_header_libs: [
+        "bionic_libc_platform_headers",
+        "libc_headers",
+    ],
+    native_shared_libs: [
+        "libc",
+        "libdl",
+        "libdl_android",
+        "libm",
+    ],
+    native_static_libs: [
+        "libasync_safe",
+    ],
+    native_objects: [
+        "crtbegin_dynamic",
+        "crtbegin_so",
+        "crtend_android",
+        "crtend_so",
+    ],
+}

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 7614784..31767ef 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2548,7 +2548,7 @@
         "//apex_available:platform",
         "com.android.media.swcodec",
     ],
-    min_sdk_version: "29",
+    min_sdk_version: "apex_inherit",
 }
 
 subdirs = [

tests/fdsan_test.cpp

diff --git a/tests/fdsan_test.cpp b/tests/fdsan_test.cpp
index 134d621..9932b21 100644
--- a/tests/fdsan_test.cpp
+++ b/tests/fdsan_test.cpp
@@ -194,7 +194,7 @@
 #endif
 }
 
-TEST_F(FdsanTest, vfork) {
+TEST_F(FdsanTest, DISABLED_vfork) {
   android::base::unique_fd fd(open("/dev/null", O_RDONLY));
 
   pid_t rc = vfork();