PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Build libinstall as a static library."

Browse Source
This commit is contained in:
Tao Bao
2019-04-08 21:22:15 +00:00
committed by Gerrit Code Review
parent 8e0821e690 0deed3389b
commit 38d5e60874
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.bp
+1 -2
View File
@@ -69,6 +69,7 @@ cc_defaults {
], ],
static_libs: [ static_libs: [
"libinstall",
"librecovery_fastboot", "librecovery_fastboot",
"libminui", "libminui",
"libotautil", "libotautil",
@@ -92,7 +93,6 @@ cc_library_static {
], ],
shared_libs: [ shared_libs: [
"libinstall",
"librecovery_ui", "librecovery_ui",
], ],
} }
@@ -112,7 +112,6 @@ cc_binary {
], ],
shared_libs: [ shared_libs: [
"libinstall",
"libminadbd_services", "libminadbd_services",
"librecovery_ui", "librecovery_ui",
], ],
CleanSpec.mk
+7 -3
View File
@@ -44,9 +44,13 @@
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) #$(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/*) #$(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/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)/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)/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
# ************************************************
install/Android.bp
+1 -1
View File
@@ -46,7 +46,7 @@ cc_defaults {
], ],
} }
cc_library { cc_library_static {
name: "libinstall", name: "libinstall",
recovery_available: true, recovery_available: true,