| commit | 581fb573e1e26168f7fd56f5ad84ce75d92fe623 | [log] [tgz] |
|---|---|---|
| author | LuK1337 <priv.luk@gmail.com> | Sat Jan 15 18:04:02 2022 +0100 |
| committer | Michael Bestas <mkbestas@lineageos.org> | Tue Oct 24 15:32:10 2023 +0300 |
| tree | 4bb32bda14718b48cad68297a08b661e66832a72 | |
| parent | 2d68994e6e9f6ebcd804b9036a1c84ccab8b70e2 [diff] |
Move mGvmqPlatform from header file to cpp Fixes duplicate symbol when linking BootControl.o and libboot_control_qti.o. Change-Id: I387a6fc24ecaef2bd1f2326f0010688b8f63ec45
diff --git a/1.1/libboot_control_qti/libboot_control_qti.cpp b/1.1/libboot_control_qti/libboot_control_qti.cpp index 25604aa..ca024b8 100644 --- a/1.1/libboot_control_qti/libboot_control_qti.cpp +++ b/1.1/libboot_control_qti/libboot_control_qti.cpp
@@ -80,6 +80,8 @@ 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 @@ // IBootControl 1.2 methods int get_active_boot_slot(); - -bool mGvmqPlatform = false;