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

Commit 59168601 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by android-build-merger
Browse files

Merge changes I06a74c84,I2cf9d3aa into qt-dev 

am: e20c7dff

Change-Id: Id50e9217a08de6988168e73c82d7b23708172594
parents 4259c81d e20c7dff

cmds/idmap2/idmap2/Create.cpp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include <sys/stat.h>   // umask

#include <sys/types.h>  // umask



#include <fstream>

#include <memory>

#include <ostream>

cmds/idmap2/idmap2/Lookup.cpp

+2 −3
Original line number Diff line number Diff line
@@ -31,15 +31,14 @@ 
#include "androidfw/ResourceUtils.h"

#include "androidfw/StringPiece.h"

#include "androidfw/Util.h"

#include "utils/String16.h"

#include "utils/String8.h"



#include "idmap2/CommandLineOptions.h"

#include "idmap2/Idmap.h"

#include "idmap2/Result.h"

#include "idmap2/SysTrace.h"

#include "idmap2/Xml.h"

#include "idmap2/ZipFile.h"

#include "utils/String16.h"

#include "utils/String8.h"



using android::ApkAssets;

using android::ApkAssetsCookie;

cmds/idmap2/idmap2/Main.cpp

+1 −2
Original line number Diff line number Diff line
@@ -23,12 +23,11 @@ 
#include <string>

#include <vector>



#include "Commands.h"

#include "idmap2/CommandLineOptions.h"

#include "idmap2/Result.h"

#include "idmap2/SysTrace.h"



#include "Commands.h"



using android::idmap2::CommandLineOptions;

using android::idmap2::Result;

using android::idmap2::Unit;

cmds/idmap2/idmap2/Scan.cpp

+5 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <dirent.h>



#include <fstream>

#include <memory>

#include <ostream>
@@ -24,8 +25,8 @@ 
#include <utility>

#include <vector>



#include "Commands.h"

#include "android-base/properties.h"



#include "idmap2/CommandLineOptions.h"

#include "idmap2/FileUtils.h"

#include "idmap2/Idmap.h"
@@ -35,8 +36,6 @@ 
#include "idmap2/Xml.h"

#include "idmap2/ZipFile.h"



#include "Commands.h"



using android::idmap2::CommandLineOptions;

using android::idmap2::Error;

using android::idmap2::Idmap;
@@ -211,7 +210,9 @@ Result<Unit> Scan(const std::vector<std::string>& args) { 


      const auto create_ok = Create(create_args);

      if (!create_ok) {

        return Error(create_ok.GetError(), "failed to create idmap");

        LOG(WARNING) << "failed to create idmap for overlay apk path \"" << overlay.apk_path

                     << "\": " << create_ok.GetError().GetMessage();

        continue;

      }

    }

cmds/idmap2/idmap2d/Idmap2Service.cpp

+3 −4
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * limitations under the License.

 */



#include "idmap2d/Idmap2Service.h"



#include <sys/stat.h>   // umask

#include <sys/types.h>  // umask

#include <unistd.h>
@@ -28,15 +30,12 @@ 
#include "android-base/macros.h"

#include "android-base/stringprintf.h"

#include "binder/IPCThreadState.h"

#include "utils/String8.h"



#include "idmap2/BinaryStreamVisitor.h"

#include "idmap2/FileUtils.h"

#include "idmap2/Idmap.h"

#include "idmap2/Policies.h"

#include "idmap2/SysTrace.h"



#include "idmap2d/Idmap2Service.h"

#include "utils/String8.h"



using android::IPCThreadState;

using android::binder::Status;