Evolution-x-devices/device_google_wahoo
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/device_google_wahoo synced 2026-02-01 07:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert^2 "Deprecate PRODUCT_STATIC_BOOT_CONTROL_HAL.""

Browse Source 
This reverts commit d83c2cc22b.

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
Merged-In: I775026345eb5fc0ec580ba4ca0282835106a1d35
(cherry picked from commit 4fa8e49020)
This commit is contained in:
Tao Bao
2019-05-15 10:00:11 -07:00
parent 12b6414919
commit 7375122722
4 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Android.bp Normal file
View File

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

3
CleanSpec.mk
View File

@@ -195,3 +195,6 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.ke
# Move libnfc-nci.conf to /vendor
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/libnfc-nci.conf)
# 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)

21
bootctrl/Android.bp Normal file
View File

@@ -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"],
}

16
device.mk
View File

@@ -29,6 +29,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
ro.adb.secure=1
PRODUCT_SOONG_NAMESPACES += \
device/google/wahoo \
hardware/qcom/msm8998
PRODUCT_COPY_FILES += \
device/google/wahoo/default-permissions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default-permissions/default-permissions.xml \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
@@ -109,7 +113,8 @@ PRODUCT_PACKAGES += \
update_verifier
PRODUCT_PACKAGES += \
bootctrl.msm8998
bootctrl.msm8998 \
bootctrl.msm8998.recovery
PRODUCT_PROPERTY_OVERRIDES += \
ro.cp_system_other_odex=1
@@ -120,14 +125,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
@@ -422,6 +419,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