diff options
author | Tao Bao <tbao@google.com> | 2019-10-03 17:40:23 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-03 17:40:23 +0200 |
commit | 678d6395b3640092429736489c62eca0a524589b (patch) | |
tree | bcea6887c7633fac75f63ab9a9172a88bfccc158 /recovery_utils/Android.bp | |
parent | Merge "otautil: Factor out the utils that're private to recovery." (diff) | |
parent | Refactor battery info querying functions into librecovery_utils. (diff) | |
download | android_bootable_recovery-678d6395b3640092429736489c62eca0a524589b.tar android_bootable_recovery-678d6395b3640092429736489c62eca0a524589b.tar.gz android_bootable_recovery-678d6395b3640092429736489c62eca0a524589b.tar.bz2 android_bootable_recovery-678d6395b3640092429736489c62eca0a524589b.tar.lz android_bootable_recovery-678d6395b3640092429736489c62eca0a524589b.tar.xz android_bootable_recovery-678d6395b3640092429736489c62eca0a524589b.tar.zst android_bootable_recovery-678d6395b3640092429736489c62eca0a524589b.zip |
Diffstat (limited to '')
-rw-r--r-- | recovery_utils/Android.bp | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/recovery_utils/Android.bp b/recovery_utils/Android.bp index 271d0799d..463f27fd8 100644 --- a/recovery_utils/Android.bp +++ b/recovery_utils/Android.bp @@ -12,6 +12,32 @@ // See the License for the specific language governing permissions and // limitations under the License. +cc_defaults { + name: "librecovery_utils_defaults", + + defaults: [ + "recovery_defaults", + ], + + shared_libs: [ + "android.hardware.health@2.0", + "libbase", + "libext4_utils", + "libfs_mgr", + "libhidlbase", + "libselinux", + "libutils", + ], + + static_libs: [ + "libotautil", + + // External dependencies. + "libfstab", + "libhealthhalutils", + ], +} + // A utility lib that's local to recovery (in contrast, libotautil is exposed to device-specific // recovery_ui lib as well as device-specific updater). cc_library_static { @@ -20,23 +46,17 @@ cc_library_static { recovery_available: true, defaults: [ - "recovery_defaults", + "librecovery_utils_defaults", ], srcs: [ + "battery_utils.cpp", "logging.cpp", "parse_install_logs.cpp", "roots.cpp", "thermalutil.cpp", ], - shared_libs: [ - "libbase", - "libext4_utils", - "libfs_mgr", - "libselinux", - ], - export_include_dirs: [ "include", ], @@ -45,13 +65,6 @@ cc_library_static { "system/vold", ], - static_libs: [ - "libotautil", - - // external dependency - "libfstab", - ], - export_static_lib_headers: [ "libfstab", ], |