diff options
| author | Tao Bao <tbao@google.com> | 2018-08-07 10:55:27 -0700 |
|---|---|---|
| committer | Tao Bao <tbao@google.com> | 2018-08-07 11:00:50 -0700 |
| commit | f32d3df46fa27fd59982bcbe314a4ed2ae7ddd14 (patch) | |
| tree | 7061e43df970c80030fc9572abc526ded037750d /libsync | |
| parent | 9b66330375ec841ef0ddef4646f79ade03c4af5c (diff) | |
| download | system_core-f32d3df46fa27fd59982bcbe314a4ed2ae7ddd14.tar.gz system_core-f32d3df46fa27fd59982bcbe314a4ed2ae7ddd14.tar.bz2 system_core-f32d3df46fa27fd59982bcbe314a4ed2ae7ddd14.zip | |
Merge libsync_recovery rules into libsync.
Statically linking against libsync is no longer a concern, since libsync
has supported the modern sync ABI (which is frozen upstream) after the
recent cleanup works.
Test: `m dist` with aosp_taimen-userdebug
Change-Id: Ic162bc7ff7c9dd306658d11d4b71e2d18730a2ee
Diffstat (limited to 'libsync')
| -rw-r--r-- | libsync/Android.bp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libsync/Android.bp b/libsync/Android.bp index dbee5964d..e56f8ba87 100644 --- a/libsync/Android.bp +++ b/libsync/Android.bp @@ -20,8 +20,9 @@ cc_defaults { cflags: ["-Werror"], } -cc_library_shared { +cc_library { name: "libsync", + recovery_available: true, defaults: ["libsync_defaults"], } @@ -31,15 +32,6 @@ llndk_library { export_include_dirs: ["include"], } -// libsync_recovery is only intended for the recovery binary. -// Future versions of the kernel WILL require an updated libsync, and will break -// anything statically linked against the current libsync. -cc_library_static { - name: "libsync_recovery", - recovery_available: true, - defaults: ["libsync_defaults"], -} - cc_test { name: "sync-unit-tests", shared_libs: ["libsync"], |