Evolution-x-devices/device_google_redfin
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/device_google_redfin synced 2026-01-27 19:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate PRODUCT_STATIC_BOOT_CONTROL_HAL.

Browse Source 
sync from 217d5f74

Bug: 139709835
Test: build pass
Change-Id: Iaa8852d7e7bfb78e7c11f61e8c3c6e25984ddb66
This commit is contained in:
Roger Liao
2019-08-02 17:43:03 +08:00
committed by Alex Hong
parent 929275cdf9
commit 4034b70e92
8 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -2,5 +2,6 @@ soong_namespace {
imports: [
"hardware/google/interfaces",
"hardware/google/pixel",
"hardware/qcom/bootctrl",
],
}

4
BoardConfig-common.mk
View File

@@ -193,10 +193,6 @@ TARGET_USES_DISPLAY_RENDER_INTENTS := true
TARGET_USES_COLOR_METADATA := true
TARGET_USES_DRM_PP := true
# Misc
TARGET_USES_HARDWARE_QCOM_BOOTCTRL := true
# Vendor Interface Manifest
DEVICE_MANIFEST_FILE := device/google/redfin/manifest.xml
DEVICE_MATRIX_FILE := device/google/redfin/compatibility_matrix.xml

3
CleanSpec.mk
View File

@@ -88,3 +88,6 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.po
# Remove VR permission
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/permissions/android.hardware.vr.headtracking.xml)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/permissions/android.hardware.vr.high_performance.xml)
# 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.lito",
defaults: ["bootctrl_hal_defaults"],
static_libs: ["libgptutils.redfin"],
}

12
device.mk
View File

@@ -124,7 +124,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
ro.sys.sdcardfs=1
PRODUCT_PACKAGES += \
bootctrl.lito
bootctrl.lito \
bootctrl.lito.recovery
PRODUCT_PROPERTY_OVERRIDES += \
ro.cp_system_other_odex=1
@@ -135,14 +136,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.lito \
libgptutils \
libz \
libcutils
PRODUCT_PACKAGES += \
update_engine_sideload \
sg_write_buffer \
@@ -437,6 +430,7 @@ PRODUCT_PACKAGES += \
# Boot control HAL
PRODUCT_PACKAGES += \
android.hardware.boot@1.0-impl \
android.hardware.boot@1.0-impl.recovery \
android.hardware.boot@1.0-service \
# Vibrator HAL

38
gpt-utils/Android.bp Normal file
View File

@@ -0,0 +1,38 @@
//
// 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: "libgptutils.redfin",
vendor: true,
recovery_available: true,
shared_libs: [
"libcutils",
"liblog",
"libz",
],
cflags: [
"-Wall",
"-Werror",
],
srcs: [
"gpt-utils.cpp",
],
owner: "qti",
header_libs: [
"device_kernel_headers",
],
export_include_dirs: ["."],
}

46
gpt-utils/Android.mk
View File

@@ -1,46 +0,0 @@
#
# Copyright 2016 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.
#
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := gpt-utils.cpp
ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
endif
LOCAL_SHARED_LIBRARIES := liblog libz
LOCAL_MODULE := libgptutils
LOCAL_MODULE_OWNER := qti
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := gpt-utils.cpp
ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
endif
LOCAL_SHARED_LIBRARIES += liblog libcutils libz
LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := libgptutils_headers
LOCAL_MODULE := libgptutils
LOCAL_MODULE_OWNER := qti
LOCAL_PROPRIETARY_MODULE := true
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libgptutils_headers
LOCAL_EXPORT_C_INCLUDE_DIRS:=$(LOCAL_PATH)
include $(BUILD_HEADER_LIBRARY)

2
gpt-utils/gpt-utils.cpp
View File

@@ -747,7 +747,6 @@ int prepare_partitions(enum boot_update_stage stage, const char *dev_path)
enum gpt_state gpt_prim, gpt_second;
enum boot_update_stage internal_stage;
struct stat xbl_partition_stat;
struct stat ufs_dir_stat;
if (!dev_path) {
fprintf(stderr, "%s: Invalid dev_path\n",
@@ -970,7 +969,6 @@ int add_lun_to_update_list(char *lun_path, struct update_data *dat)
int prepare_boot_update(enum boot_update_stage stage)
{
int r, fd;
int is_ufs = gpt_utils_is_ufs_device();
struct stat ufs_dir_stat;
struct update_data data;