donjohanliebert/device_motorola_sm7325-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move mGvmqPlatform from header file to cpp

Browse Source 
Fixes duplicate symbol when linking BootControl.o and
libboot_control_qti.o.

Change-Id: I387a6fc24ecaef2bd1f2326f0010688b8f63ec45
This commit is contained in:
LuK1337 2022-01-15 18:04:02 +01:00 committed by SGCMarkus
parent f4a59c1102
commit f8bbee0e67
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootctrl/1.1/libboot_control_qti/libboot_control_qti.cpp
View File

@ -81,6 +81,8 @@ enum part_attr_type {
ATTR_UNBOOTABLE,
};
bool mGvmqPlatform = false;
using ::android::bootable::GetMiscVirtualAbMergeStatus;
using ::android::bootable::InitMiscVirtualAbMessageIfNeeded;
using ::android::bootable::SetMiscVirtualAbMergeStatus;

2
bootctrl/1.1/libboot_control_qti/libboot_control_qti.h
View File

@ -48,5 +48,3 @@ const char* get_suffix(unsigned slot);
// IBootControl 1.1 methods
bool set_snapshot_merge_status(MergeStatus status);
MergeStatus get_snapshot_merge_status();
bool mGvmqPlatform = false;