From 4fa8e490208bef42faccf204381dc35ad1cfed46 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Wed, 15 May 2019 10:00:11 -0700
Subject: [PATCH] Revert^2 "Deprecate PRODUCT_STATIC_BOOT_CONTROL_HAL.""

This reverts commit d83c2cc22b3f037e94cd4ad7e19f5985da13a8b8.

The previous landing broke checkbuild targets due to namespace issue.
See the commit message for hardware/qcom/msm8998 change.

Bug: 34254109
Test: Build and boot taimen on device to home screen.
Test: Sideload on taimen.
Change-Id: I775026345eb5fc0ec580ba4ca0282835106a1d35
---
 Android.bp          |  2 ++
 CleanSpec.mk        |  3 +++
 bootctrl/Android.bp | 21 +++++++++++++++++++++
 device.mk           | 15 +++++----------
 4 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 bootctrl/Android.bp

diff --git a/Android.bp b/Android.bp
index c0284975..7aedf81c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,7 @@
 soong_namespace {
     imports: [
         "hardware/google/pixel",
+        "hardware/qcom/bootctrl",
+        "hardware/qcom/msm8998",
     ],
 }
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 4e86f77e..0f7e7282 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -201,3 +201,6 @@ $(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
new file mode 100644
index 00000000..b420e875
--- /dev/null
+++ b/bootctrl/Android.bp
@@ -0,0 +1,21 @@
+//
+// 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 7c0fdfcd..536137dd 100755
--- a/device.mk
+++ b/device.mk
@@ -38,7 +38,8 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 PRODUCT_SOONG_NAMESPACES += \
     device/google/wahoo \
     vendor/google/camera \
-    hardware/google/pixel
+    hardware/google/pixel \
+    hardware/qcom/msm8998
 
 PRODUCT_COPY_FILES += \
     device/google/wahoo/default-permissions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default-permissions/default-permissions.xml \
@@ -130,7 +131,8 @@ PRODUCT_PACKAGES += \
     update_verifier
 
 PRODUCT_PACKAGES += \
-    bootctrl.msm8998
+    bootctrl.msm8998 \
+    bootctrl.msm8998.recovery
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.cp_system_other_odex=1
@@ -141,14 +143,6 @@ 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
 
@@ -447,6 +441,7 @@ 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