Revert "Avoid internal APEX stubs for libsigchain and clean up e..." am: 5557553ae9 am: 45c45f6e07
Original change: https://android-review.googlesource.com/c/platform/art/+/1660247
Change-Id: Ie6f33f0a6b2fd5a4fc994fefa84963c8cb1e644e
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index 0d01d26..8c7114e 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -240,10 +240,6 @@
},
apex_available: [
"com.android.art.debug",
- // TODO(b/183882457): This lib doesn't go into com.android.art, but
- // apex_available lists need to be the same for internal libs to avoid
- // stubs, and libartd depends on this.
- "com.android.art",
],
stubs: {
// TODO(b/143978909): Rename and move this file to this directory.
diff --git a/libprofile/Android.bp b/libprofile/Android.bp
index 2edf821..50f806e 100644
--- a/libprofile/Android.bp
+++ b/libprofile/Android.bp
@@ -175,10 +175,6 @@
export_shared_lib_headers: ["libbase"],
apex_available: [
"com.android.art.debug",
- // TODO(b/183882457): This lib doesn't go into com.android.art, but
- // apex_available lists need to be the same for internal libs to avoid
- // stubs, and libartd depends on this.
- "com.android.art",
],
}
diff --git a/runtime/Android.bp b/runtime/Android.bp
index f8d733d..ca2fb36 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -586,10 +586,6 @@
],
apex_available: [
"com.android.art.debug",
- // TODO(b/183882457): This lib doesn't go into com.android.art, but
- // apex_available lists need to be the same for internal libs to avoid
- // stubs, and this depends on libsigchain.
- "com.android.art",
],
}
diff --git a/sigchainlib/libsigchain.map.txt b/sigchainlib/libsigchain.map.txt
index 02c20c7..148c4ed 100644
--- a/sigchainlib/libsigchain.map.txt
+++ b/sigchainlib/libsigchain.map.txt
@@ -16,10 +16,10 @@
LIBSIGCHAIN_1 {
global:
- # Export no symbols - the only external entry points are libc overrides.
- # Since this section cannot be empty for APEX stubs generation we provide a
- # phony entry.
- LibsigchainNonexistentFunction;
+ EnsureFrontOfChain;
+ AddSpecialSignalHandlerFn;
+ RemoveSpecialSignalHandlerFn;
+ SkipAddSignalHandler;
local:
*;
};