Merge tag 'LA.UM.5.8.r1-02900-8x98.0' into int/n/fp2
"LA.UM.5.8.r1-02900-8x98.0"
* tag 'LA.UM.5.8.r1-02900-8x98.0':
bootcontrol: Only compile when the A/B feature is enabled
bootcontrol: Reduce the number of writes in the set active slot function
bootcontrol: Update a check in set_active_boot_slot
bootctrl: Fix implementation of get_current_slot
bootctrl: Initial commit for the boot control HAL
init empty file
Conflicts in Android.mk. Solved by taking CAF version.
Issue: FP2N-105
Change-Id: I8f3c19a657d748ed239ff510bd706ff6bf541283
diff --git a/Android.mk b/Android.mk
index cf5e90d..957d573 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,5 @@
-ifneq ($(filter msm8996,$(TARGET_BOARD_PLATFORM)),)
+ifeq ($(AB_OTA_UPDATER),true)
LOCAL_PATH := $(call my-dir)
-
-# HAL Shared library for the target. Used by libhardware.
include $(CLEAR_VARS)
LOCAL_C_INCLUDES += hardware/libhardware/include
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/gpt-utils/inc
@@ -11,15 +9,4 @@
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE := bootctrl.$(TARGET_BOARD_PLATFORM)
include $(BUILD_SHARED_LIBRARY)
-
-# Static library for the target. Used by update_engine_sideload from recovery.
-include $(CLEAR_VARS)
-LOCAL_C_INCLUDES += hardware/libhardware/include
-LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/gpt-utils/inc
-LOCAL_CFLAGS += -Wall -Werror
-LOCAL_SHARED_LIBRARIES += liblog librecovery_updater_msm libcutils
-LOCAL_SRC_FILES := boot_control.cpp
-LOCAL_MODULE := bootctrl.$(TARGET_BOARD_PLATFORM)
-include $(BUILD_STATIC_LIBRARY)
-
endif