Move version scripts to app_process, where they are used.
This is a temporary measure to avoid exporting filegroups in the SDK
snapshots. The version scripts will go away when libsigchain can be a
shared lib.
Test: Build and boot
Bug: 153338107
Bug: 142944043
Change-Id: Ia043ced745fa41113a48b7724dafbb8c6b03e6d5
diff --git a/sigchainlib/Android.bp b/sigchainlib/Android.bp
index ac909a6..0e25f62 100644
--- a/sigchainlib/Android.bp
+++ b/sigchainlib/Android.bp
@@ -18,7 +18,7 @@
name: "libsigchain",
defaults: ["art_defaults"],
visibility: [
- // TODO(b/133140750): Clean this up.
+ // TODO(b/142944043, b/133140750): Clean this up.
"//frameworks/base/cmds/app_process",
],
@@ -46,7 +46,7 @@
apex_available: [
"com.android.art.release",
"com.android.art.debug",
- // TODO(b/142944931) Clean this up. This is due to the dependency from
+ // TODO(b/142944043) Clean this up. This is due to the dependency from
// app_process
"//apex_available:platform",
],
@@ -77,21 +77,3 @@
srcs: ["sigchain_test.cc"],
whole_static_libs: ["libsigchain"],
}
-
-filegroup {
- name: "art_sigchain_version_script32.txt",
- visibility: [
- // TODO(b/133140750): Clean this up.
- "//frameworks/base/cmds/app_process",
- ],
- srcs: ["version-script32.txt"],
-}
-
-filegroup {
- name: "art_sigchain_version_script64.txt",
- visibility: [
- // TODO(b/133140750): Clean this up.
- "//frameworks/base/cmds/app_process",
- ],
- srcs: ["version-script64.txt"],
-}
diff --git a/sigchainlib/sigchain.h b/sigchainlib/sigchain.h
index 9c24a6f..13ec85d 100644
--- a/sigchainlib/sigchain.h
+++ b/sigchainlib/sigchain.h
@@ -17,6 +17,10 @@
#ifndef ART_SIGCHAINLIB_SIGCHAIN_H_
#define ART_SIGCHAINLIB_SIGCHAIN_H_
+// TODO(b/142944043): Symbol changes here currently need to be reflected in
+// version scripts in frameworks/base/cmds/app_process. The plan is to convert
+// libsigchain to a shared lib to get rid of them.
+
#include <signal.h>
#include <stdint.h>
diff --git a/sigchainlib/version-script32.txt b/sigchainlib/version-script32.txt
deleted file mode 100644
index 70810e0..0000000
--- a/sigchainlib/version-script32.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-global:
- EnsureFrontOfChain;
- AddSpecialSignalHandlerFn;
- RemoveSpecialSignalHandlerFn;
- SkipAddSignalHandler;
- bsd_signal;
- sigaction;
- sigaction64;
- signal;
- sigprocmask;
- sigprocmask64;
-local:
- *;
-};
diff --git a/sigchainlib/version-script64.txt b/sigchainlib/version-script64.txt
deleted file mode 100644
index 7bcd76b..0000000
--- a/sigchainlib/version-script64.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-global:
- EnsureFrontOfChain;
- AddSpecialSignalHandlerFn;
- RemoveSpecialSignalHandlerFn;
- SkipAddSignalHandler;
- sigaction;
- sigaction64;
- signal;
- sigprocmask;
- sigprocmask64;
-local:
- *;
-};