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

Commit 4670805e authored by Adam Lesinski's avatar Adam Lesinski
Browse files

AAPT2: Move format related files under same directory 

Test: make aapt2_tests
Change-Id: Id72cdfc12ba3add294048e60c55f2461344464bf
parent 65e91ce6

tools/aapt2/Android.bp

+7 −7
Original line number Diff line number Diff line
@@ -83,9 +83,13 @@ cc_library_host_static { 
        "configuration/ConfigurationParser.cpp",

        "filter/AbiFilter.cpp",

        "filter/ConfigFilter.cpp",

        "flatten/Archive.cpp",

        "flatten/TableFlattener.cpp",

        "flatten/XmlFlattener.cpp",

        "format/Archive.cpp",

        "format/binary/BinaryResourceParser.cpp",

        "format/binary/ResChunkPullParser.cpp",

        "format/binary/TableFlattener.cpp",

        "format/binary/XmlFlattener.cpp",

        "format/proto/ProtoDeserialize.cpp",

        "format/proto/ProtoSerialize.cpp",

        "io/BigBufferStreams.cpp",

        "io/File.cpp",

        "io/FileInputStream.cpp",
@@ -106,13 +110,9 @@ cc_library_host_static { 
        "optimize/ResourceDeduper.cpp",

        "optimize/VersionCollapser.cpp",

        "process/SymbolTable.cpp",

        "proto/ProtoDeserialize.cpp",

        "proto/ProtoSerialize.cpp",

        "split/TableSplitter.cpp",

        "text/Unicode.cpp",

        "text/Utf8Iterator.cpp",

        "unflatten/BinaryResourceParser.cpp",

        "unflatten/ResChunkPullParser.cpp",

        "util/BigBuffer.cpp",

        "util/Files.cpp",

        "util/Util.cpp",

tools/aapt2/LoadedApk.cpp

+3 −3
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ 


#include "ResourceValues.h"

#include "ValueVisitor.h"

#include "flatten/Archive.h"

#include "flatten/TableFlattener.h"

#include "flatten/XmlFlattener.h"

#include "format/Archive.h"

#include "format/binary/TableFlattener.h"

#include "format/binary/XmlFlattener.h"

#include "io/BigBufferInputStream.h"

#include "io/Util.h"

#include "xml/XmlDom.h"

tools/aapt2/LoadedApk.h

+21 −13
Original line number Diff line number Diff line
@@ -21,27 +21,35 @@ 


#include "ResourceTable.h"

#include "filter/Filter.h"

#include "flatten/Archive.h"

#include "flatten/TableFlattener.h"

#include "format/Archive.h"

#include "format/binary/BinaryResourceParser.h"

#include "format/binary/TableFlattener.h"

#include "io/ZipArchive.h"

#include "unflatten/BinaryResourceParser.h"

#include "xml/XmlDom.h"



namespace aapt {



/** Info about an APK loaded in memory. */

// Info about an APK loaded in memory.

class LoadedApk {

 public:

  LoadedApk(const Source& source, std::unique_ptr<io::IFileCollection> apk,

  LoadedApk(

      const Source& source,

      std::unique_ptr<io::IFileCollection> apk,

      std::unique_ptr<ResourceTable> table)

      : source_(source), apk_(std::move(apk)), table_(std::move(table)) {

  }

      : source_(source), apk_(std::move(apk)), table_(std::move(table)) {}

  virtual ~LoadedApk() = default;



  io::IFileCollection* GetFileCollection() { return apk_.get(); }

  io::IFileCollection* GetFileCollection() {

    return apk_.get();

  }



  ResourceTable* GetResourceTable() { return table_.get(); }

  ResourceTable* GetResourceTable() {

    return table_.get();

  }



  const Source& GetSource() { return source_; }

  const Source& GetSource() {

    return source_;

  }



  /**

   * Writes the APK on disk at the given path, while also removing the resource
@@ -70,11 +78,11 @@ class LoadedApk { 
                                                    const android::StringPiece& path);



 private:

  DISALLOW_COPY_AND_ASSIGN(LoadedApk);



  Source source_;

  std::unique_ptr<io::IFileCollection> apk_;

  std::unique_ptr<ResourceTable> table_;



  DISALLOW_COPY_AND_ASSIGN(LoadedApk);

};



}  // namespace aapt

tools/aapt2/ResourceUtils.cpp

+3 −3
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ 


#include "NameMangler.h"

#include "SdkConstants.h"

#include "flatten/ResourceTypeExtensions.h"

#include "format/binary/ResourceTypeExtensions.h"

#include "util/Files.h"

#include "util/Util.h"



using android::StringPiece;

using android::StringPiece16;

using ::android::StringPiece;

using ::android::StringPiece16;



namespace aapt {

namespace ResourceUtils {

tools/aapt2/cmd/Compile.cpp

+3 −3
Original line number Diff line number Diff line
@@ -35,12 +35,12 @@ 
#include "compile/Png.h"

#include "compile/PseudolocaleGenerator.h"

#include "compile/XmlIdCollector.h"

#include "flatten/Archive.h"

#include "flatten/XmlFlattener.h"

#include "format/Archive.h"

#include "format/binary/XmlFlattener.h"

#include "format/proto/ProtoSerialize.h"

#include "io/BigBufferOutputStream.h"

#include "io/FileInputStream.h"

#include "io/Util.h"

#include "proto/ProtoSerialize.h"

#include "util/Files.h"

#include "util/Maybe.h"

#include "util/Util.h"