From 243bc1929b33f19e26897fbcf19054f5e42ce20a Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Fri, 6 Mar 2020 14:00:53 -0800 Subject: [PATCH] Fix bugprone-use-after-move warnings Bug: 150783499 Test: WITH_TIDY=1 make Change-Id: I185cb21521676ddbc4f2b7f098611a2efc7275e6 (cherry picked from commit c658184d366ee08cedd9ec208ea327530b52bfad) Merged-In: I185cb21521676ddbc4f2b7f098611a2efc7275e6 --- libs/androidfw/ApkAssets.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/androidfw/ApkAssets.cpp b/libs/androidfw/ApkAssets.cpp index 237c1e970b17e..09705e1aae67d 100644 --- a/libs/androidfw/ApkAssets.cpp +++ b/libs/androidfw/ApkAssets.cpp @@ -70,8 +70,11 @@ std::unique_ptr ApkAssets::LoadOverlay(const std::string& idmap LOG(ERROR) << "failed to load IDMAP " << idmap_path; return {}; } - return LoadImpl({} /*fd*/, loaded_idmap->OverlayApkPath(), std::move(idmap_asset), - std::move(loaded_idmap), system, false /*load_as_shared_library*/); + auto apkPath = loaded_idmap->OverlayApkPath(); + return LoadImpl({} /*fd*/, apkPath, + std::move(idmap_asset), + std::move(loaded_idmap), + system, false /*load_as_shared_library*/); } std::unique_ptr ApkAssets::LoadFromFd(unique_fd fd,