From f8bbee0e67e35f87d9807baf1095c6220be45f9d Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sat, 15 Jan 2022 18:04:02 +0100 Subject: [PATCH] Move mGvmqPlatform from header file to cpp Fixes duplicate symbol when linking BootControl.o and libboot_control_qti.o. Change-Id: I387a6fc24ecaef2bd1f2326f0010688b8f63ec45 --- bootctrl/1.1/libboot_control_qti/libboot_control_qti.cpp | 2 ++ bootctrl/1.1/libboot_control_qti/libboot_control_qti.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootctrl/1.1/libboot_control_qti/libboot_control_qti.cpp b/bootctrl/1.1/libboot_control_qti/libboot_control_qti.cpp index fc81759..371be6d 100644 --- a/bootctrl/1.1/libboot_control_qti/libboot_control_qti.cpp +++ b/bootctrl/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/bootctrl/1.1/libboot_control_qti/libboot_control_qti.h b/bootctrl/1.1/libboot_control_qti/libboot_control_qti.h index c669a0e..b055a49 100644 --- a/bootctrl/1.1/libboot_control_qti/libboot_control_qti.h +++ b/bootctrl/1.1/libboot_control_qti/libboot_control_qti.h @@ -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;