diff options
| author | LuK1337 <priv.luk@gmail.com> | 2022-01-15 18:04:02 +0100 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2023-06-12 20:26:53 +0800 |
| commit | c121615570f479d9bbf792c17e40f396e0ad51d0 (patch) | |
| tree | 39797dc748b9c093a165947bb4ec2ebb17f07cad | |
| parent | 0032cb00332793d8eef9a6fc91bc296df19e771c (diff) | |
Move mGvmqPlatform from header file to cppuminekotachibana-mr1
Fixes duplicate symbol when linking BootControl.o and
libboot_control_qti.o.
Change-Id: I387a6fc24ecaef2bd1f2326f0010688b8f63ec45
| -rw-r--r-- | 1.1/libboot_control_qti/libboot_control_qti.cpp | 2 | ||||
| -rw-r--r-- | 1.1/libboot_control_qti/libboot_control_qti.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/1.1/libboot_control_qti/libboot_control_qti.cpp b/1.1/libboot_control_qti/libboot_control_qti.cpp index 81e7f03..47f7a43 100644 --- a/1.1/libboot_control_qti/libboot_control_qti.cpp +++ b/1.1/libboot_control_qti/libboot_control_qti.cpp @@ -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; diff --git a/1.1/libboot_control_qti/libboot_control_qti.h b/1.1/libboot_control_qti/libboot_control_qti.h index bc49d65..837be77 100644 --- a/1.1/libboot_control_qti/libboot_control_qti.h +++ b/1.1/libboot_control_qti/libboot_control_qti.h @@ -51,5 +51,3 @@ MergeStatus get_snapshot_merge_status(); // IBootControl 1.2 methods int get_active_boot_slot(); - -bool mGvmqPlatform = false; |