From d83c2cc22b3f037e94cd4ad7e19f5985da13a8b8 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Wed, 15 May 2019 16:41:50 +0000
Subject: [PATCH] Revert "Deprecate PRODUCT_STATIC_BOOT_CONTROL_HAL."

This reverts commit 74e2a5d8577bdd72985158479d37033e6bd2f9fd.

Reason for revert: broken aosp_x86-eng checkbuild

Bug: 34254109
Change-Id: I704acab3d2aac89906d03623032d8fd71a96b104
---
 Android.bp          |  1 -
 CleanSpec.mk        |  3 ---
 bootctrl/Android.bp | 21 ---------------------
 device.mk           | 12 +++++++++---
 4 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 bootctrl/Android.bp

diff --git a/Android.bp b/Android.bp
index 51337da9..c0284975 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,6 +1,5 @@
 soong_namespace {
     imports: [
         "hardware/google/pixel",
-        "hardware/qcom/bootctrl",
     ],
 }
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 0f7e7282..4e86f77e 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -201,6 +201,3 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib/hw/android.hardware.grap
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib64/hw/android.hardware.graphics.mapper@2.0-impl.so)
 # Rename power HAL
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.power@1.2-service.wahoo-libperfmgr.rc)
-
-# Remove obsolete android.hardware.boot@1.0-impl-wrapper.recovery.so
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/system/lib64/hw/android.hardware.boot@1.0-impl-wrapper.recovery.so)
diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp
deleted file mode 100644
index b420e875..00000000
--- a/bootctrl/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Copyright (C) 2019 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-cc_library {
-    name: "bootctrl.msm8998",
-    defaults: ["bootctrl_hal_defaults"],
-    static_libs: ["libgptutils.msm8998"],
-}
diff --git a/device.mk b/device.mk
index 1565b8c5..c8d14254 100755
--- a/device.mk
+++ b/device.mk
@@ -130,8 +130,7 @@ PRODUCT_PACKAGES += \
     update_verifier
 
 PRODUCT_PACKAGES += \
-    bootctrl.msm8998 \
-    bootctrl.msm8998.recovery
+    bootctrl.msm8998
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.cp_system_other_odex=1
@@ -150,6 +149,14 @@ AB_OTA_POSTINSTALL_CONFIG += \
     FILESYSTEM_TYPE_system=ext4 \
     POSTINSTALL_OPTIONAL_system=true
 
+# Enable update engine sideloading by including the static version of the
+# boot_control HAL and its dependencies.
+PRODUCT_STATIC_BOOT_CONTROL_HAL := \
+    bootctrl.msm8998 \
+    libgptutils \
+    libz \
+    libcutils
+
 PRODUCT_PACKAGES += \
     update_engine_sideload
 
@@ -448,7 +455,6 @@ PRODUCT_PACKAGES += \
 # Boot control HAL
 PRODUCT_PACKAGES += \
     android.hardware.boot@1.0-impl:64 \
-    android.hardware.boot@1.0-impl.recovery:64 \
     android.hardware.boot@1.0-service \
 
 # Vibrator HAL