Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cbb0075 authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Todd Kennedy
Browse files

idmap2: add systrace logs 

Thanks to the ART team for art/libartbase/base/systrace.h which served
as inspiration for the SYSTRACE macro.

Bug: 119761810
Test: run idmap2_tests on device while capturing systrace
Change-Id: I81112ae8e58daf20ebed33ef8b0f5a0caa4dbc73
parent ec820ed3

cmds/idmap2/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ cc_library { 
            shared_libs: [

                "libandroidfw",

                "libbase",

                "libcutils",

                "libutils",

                "libziparchive",

            ],
@@ -150,6 +151,7 @@ cc_binary { 
            shared_libs: [

                "libandroidfw",

                "libbase",

                "libcutils",

                "libidmap2",

                "libutils",

                "libziparchive",

cmds/idmap2/idmap2/Create.cpp

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "idmap2/Idmap.h"

#include "idmap2/Policies.h"

#include "idmap2/Result.h"

#include "idmap2/SysTrace.h"



using android::ApkAssets;

using android::idmap2::BinaryStreamVisitor;
@@ -42,6 +43,7 @@ using android::idmap2::utils::kIdmapFilePermissionMask; 
using android::idmap2::utils::UidHasWriteAccessToPath;



bool Create(const std::vector<std::string>& args, std::ostream& out_error) {

  SYSTRACE << "Create " << args;

  std::string target_apk_path;

  std::string overlay_apk_path;

  std::string idmap_path;

cmds/idmap2/idmap2/Dump.cpp

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "idmap2/Idmap.h"

#include "idmap2/PrettyPrintVisitor.h"

#include "idmap2/RawPrintVisitor.h"

#include "idmap2/SysTrace.h"



using android::idmap2::CommandLineOptions;

using android::idmap2::Idmap;
@@ -31,6 +32,7 @@ using android::idmap2::PrettyPrintVisitor; 
using android::idmap2::RawPrintVisitor;



bool Dump(const std::vector<std::string>& args, std::ostream& out_error) {

  SYSTRACE << "Dump " << args;

  std::string idmap_path;

  bool verbose;

cmds/idmap2/idmap2/Lookup.cpp

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "idmap2/CommandLineOptions.h"

#include "idmap2/Idmap.h"

#include "idmap2/Result.h"

#include "idmap2/SysTrace.h"

#include "idmap2/Xml.h"

#include "idmap2/ZipFile.h"
@@ -156,6 +157,7 @@ Result<std::string> GetTargetPackageNameFromManifest(const std::string& apk_path 
}  // namespace



bool Lookup(const std::vector<std::string>& args, std::ostream& out_error) {

  SYSTRACE << "Lookup " << args;

  std::vector<std::string> idmap_paths;

  std::string config_str;

  std::string resid_str;

cmds/idmap2/idmap2/Main.cpp

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <vector>



#include "idmap2/CommandLineOptions.h"

#include "idmap2/SysTrace.h"



#include "Commands.h"
@@ -48,6 +49,7 @@ void PrintUsage(const NameToFunctionMap& commands, std::ostream& out) { 
}  // namespace



int main(int argc, char** argv) {

  SYSTRACE << "main";

  const NameToFunctionMap commands = {

      {"create", Create}, {"dump", Dump}, {"lookup", Lookup}, {"scan", Scan}, {"verify", Verify},

  };