Browse Source

[Android-10] Switch to new .bp way of building bootctrl.

See:
https://android.googlesource.com/platform/build/+/master/Changes.md#product_static_boot_control_hal
The build system now supports shared-library HALs in recovery, and
allows bootctrl to be simplified.

Note that hardware/qcom/bootctrl is defined in a namespace, which
automatically requires the platform to define a new namespace as well
(in order to include the bootctrl namespace).
device-sony-common receives a patch to expose platform namespaces to
soong through PRODUCT_SOONG_NAMESPACES. See:
https://android.googlesource.com/platform/build/soong/+/master/README.md#name-resolution

Signed-off-by: MarijnS95 <marijns95@gmail.com>
avb-allow-disable-verity
MarijnS95 2 years ago
parent
commit
d21bd67a00
  1. 3
      Android.bp
  2. 22
      bootctrl/Android.bp
  3. 11
      platform.mk

3
Android.bp

@ -0,0 +1,3 @@
soong_namespace {
imports: ["hardware/qcom/bootctrl"],
}

22
bootctrl/Android.bp

@ -0,0 +1,22 @@
//
// Copyright (C) 2018 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.sdm845",
defaults: ["bootctrl_hal_defaults"],
static_libs: ["libgptutils"],
}

11
platform.mk

@ -30,8 +30,6 @@ DEVICE_PACKAGE_OVERLAYS += \
# A/B support
AB_OTA_UPDATER := true
TARGET_USES_HARDWARE_QCOM_BOOTCTRL := true
PRODUCT_SHIPPING_API_LEVEL := 26
# A/B OTA dexopt package
@ -51,15 +49,8 @@ PRODUCT_PACKAGES += \
update_engine_client \
update_engine_sideload \
update_verifier \
bootctrl.sdm845
# Enable update engine sideloading by including the static version of the
# boot_control HAL and its dependencies.
PRODUCT_STATIC_BOOT_CONTROL_HAL := \
bootctrl.sdm845 \
libgptutils \
libz \
libcutils
bootctrl.sdm845.recovery
AB_OTA_PARTITIONS += \
boot \

Loading…
Cancel
Save