Skip to content

Commit 7744a54

Browse files
Hridya Valsarajuraphaelthegreat
Hridya Valsaraju
authored andcommitted
NB1: Build bootctrl.msm8998 using Soong
This is required to build the recovery variant of the same to be used by fastbootd. Bug: 78793464 Test: make Change-Id: I16eddcb853bda1a9969810f258884ebdbbfc1f5c
1 parent 16d001b commit 7744a54

File tree

3 files changed

+28
-6
lines changed

3 files changed

+28
-6
lines changed

Android.bp

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
soong_namespace {
2+
imports: ["hardware/qcom/bootctrl"],
3+
}

bootctrl/Android.bp

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
//
2+
// Copyright (C) 2018 The Android Open Source Project
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
//
16+
17+
cc_library {
18+
name: "bootctrl.msm8998",
19+
defaults: ["bootctrl_hal_defaults"],
20+
static_libs: ["libgptutils.msm8998"],
21+
}

device.mk

+4-6
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ PRODUCT_COPY_FILES += \
6161
hardware/qcom-caf/msm8998/audio/configs/msm8998/audio_tuning_mixer_tavil.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer_tavil.txt
6262

6363
# Boot control
64+
PRODUCT_PACKAGES += \
65+
66+
bootctrl.msm8998.recovery
67+
6468
PRODUCT_PACKAGES += \
6569
6670
@@ -69,12 +73,6 @@ PRODUCT_PACKAGES += \
6973
PRODUCT_PACKAGES_DEBUG += \
7074
bootctl
7175

72-
PRODUCT_STATIC_BOOT_CONTROL_HAL := \
73-
bootctrl.msm8998 \
74-
libcutils \
75-
libgptutils \
76-
libz
77-
7876
# Exclude sensor from InputManager
7977
PRODUCT_COPY_FILES += \
8078
$(LOCAL_PATH)/configs/excluded-input-devices.xml:system/etc/excluded-input-devices.xml \

0 commit comments

Comments
 (0)