Evolution-x-devices/device_google_taimen
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/device_google_taimen synced 2026-01-27 15:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

taimen: gpt-utils: Deprecate PRODUCT_STATIC_BOOT_CONTROL_HAL

Browse Source 
In favor of using boot control HAL under recovery.

Bug: 34254109
Test: TreeHugger

This is a combination of 2 commits.
This is the 1st commit message:

Revert^2 "Build libgptutils with Android.bp.""

This reverts commit 215189f0b9ff44d28c2b4ace0abb26854b201271.

The previous landing broke checkbuild targets due to namespace issue. As
libgptutils.msm8998 was exposed to global namespace (previously guarded
via conditionals in Android.mk), but had a missing dependency on
nonexposed msm8998 kernel headers.

The relanding adds a Soong namespace of hardware/qcom/msm8998, to ensure
modules only getting built as needed.

Bug: 34254109
Test: Sideload on taimen.
Test: `m -j checkbuild` with aosp_x86-eng
Change-Id: I4a7c4cedcf58c7735172d989912e4f7afad1eaed
Merged-In: I4a7c4cedcf58c7735172d989912e4f7afad1eaed
(cherry picked from commit e74c7611d2cbea03ec8ec1559787a7a57b2bf767)

This is the commit message #2:

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
Merged-In: I775026345eb5fc0ec580ba4ca0282835106a1d35
(cherry picked from commit 4fa8e490208bef42faccf204381dc35ad1cfed46)
This commit is contained in:
Tao Bao
2019-05-15 10:00:29 -07:00
committed by Asriadi Rahim
parent c988a87f71
commit e28d504d68
2 changed files with 38 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,38 @@
//
// Copyright (C) 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.
//
cc_library {
name: "libgptutils.msm8998",
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: ["."],
}

47
gpt-utils/Android.mk
View File

@@ -1,47 +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)
gpt_utils_common_cflags := -Wall -Werror
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
LOCAL_CFLAGS := $(gpt_utils_common_cflags)
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_MODULE := libgptutils
LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_OWNER := qti
LOCAL_COPY_HEADERS_TO := gpt-utils/inc
LOCAL_COPY_HEADERS := gpt-utils.h
LOCAL_CFLAGS := $(gpt_utils_common_cflags)
include $(BUILD_SHARED_LIBRARY)