commit 5f8394ca88e33bb0a0af374ad5412650a6e222e6
author Dees Troy <dees_troy@teamw.in> Sun Mar 17 16:09:56 2019 +0100
committer Gerrit Code Review <gerrit2@gerrit.omnirom.org> Sun Mar 17 16:09:56 2019 +0100
tree a3c9553a9bde7d2942796d1b7d659fde7a15ad08
parent 3ae89edb406e41592d61ee9e10cb34caa9cc2ae5
parent c630cee1ae54bf1877c4a1c13bb4a71302de6a92

Merge "slot management: add library for slot management." into android-9.0

Android.mk

diff --git a/Android.mk b/Android.mk
index 95c190e..6ee4060 100644
--- a/Android.mk
+++ b/Android.mk
@@ -185,7 +185,7 @@
 
 ifeq ($(AB_OTA_UPDATER),true)
     LOCAL_CFLAGS += -DAB_OTA_UPDATER=1
-    LOCAL_SHARED_LIBRARIES += libhardware
+    LOCAL_SHARED_LIBRARIES += libhardware android.hardware.boot@1.0
     LOCAL_REQUIRED_MODULES += libhardware
 endif
 

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 5dc110e..f792042 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -198,7 +198,6 @@
             RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.gatekeeper@1.0.so
             RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/hwservicemanager
             RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/avbctl
-            RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/hwservicemanager
             RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/keystore
             RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/keystore_cli
             RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/servicemanager
@@ -240,6 +239,7 @@
     endif
 endif
 ifeq ($(AB_OTA_UPDATER), true)
+    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.boot@1.0.so
     RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/bootctl
     ifneq ($(TW_INCLUDE_CRYPTO), true)
         RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libhardware.so