diff options
| author | Tao Bao <tbao@google.com> | 2019-04-09 12:47:42 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-09 12:47:42 +0200 |
| commit | 8630a658e947849fb3fa9d42d59dd01c42139519 (patch) | |
| tree | 774482b70874beccca8d6068a26dad8794ff912a | |
| parent | Merge "libotautil exports libfstab header." am: 8e0821e690 (diff) | |
| parent | Merge "Build libinstall as a static library." (diff) | |
| download | android_bootable_recovery-8630a658e947849fb3fa9d42d59dd01c42139519.tar android_bootable_recovery-8630a658e947849fb3fa9d42d59dd01c42139519.tar.gz android_bootable_recovery-8630a658e947849fb3fa9d42d59dd01c42139519.tar.bz2 android_bootable_recovery-8630a658e947849fb3fa9d42d59dd01c42139519.tar.lz android_bootable_recovery-8630a658e947849fb3fa9d42d59dd01c42139519.tar.xz android_bootable_recovery-8630a658e947849fb3fa9d42d59dd01c42139519.tar.zst android_bootable_recovery-8630a658e947849fb3fa9d42d59dd01c42139519.zip | |
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | CleanSpec.mk | 10 | ||||
| -rw-r--r-- | install/Android.bp | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp index fc8b139a2..137004c07 100644 --- a/Android.bp +++ b/Android.bp @@ -69,6 +69,7 @@ cc_defaults { ], static_libs: [ + "libinstall", "librecovery_fastboot", "libminui", "libotautil", @@ -92,7 +93,6 @@ cc_library_static { ], shared_libs: [ - "libinstall", "librecovery_ui", ], } @@ -112,7 +112,6 @@ cc_binary { ], shared_libs: [ - "libinstall", "libminadbd_services", "librecovery_ui", ], diff --git a/CleanSpec.mk b/CleanSpec.mk index fec823e7e..a7ab0d9be 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -44,9 +44,13 @@ #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) -# ************************************************ -# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST -# ************************************************ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/recovery_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libminui_intermediates/import_includes) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/sbin) + +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libinstall.recovery_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/system/lib64/libinstall.so) + +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ diff --git a/install/Android.bp b/install/Android.bp index 095a6d027..85cf9ac4a 100644 --- a/install/Android.bp +++ b/install/Android.bp @@ -46,7 +46,7 @@ cc_defaults { ], } -cc_library { +cc_library_static { name: "libinstall", recovery_available: true, |