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

Commit 55f43ef8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove lite optimization from protos"

parents b87855f6 22ead1c3

tools/aapt2/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ cc_defaults { 
        "libziparchive",

        "libpng",

        "libbase",

        "libprotobuf-cpp-lite",

        "libprotobuf-cpp-full",

        "libz",

        "libbuildversion",

    ],

tools/aapt2/Configuration.proto

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ syntax = "proto3"; 
package aapt.pb;



option java_package = "com.android.aapt";

option optimize_for = LITE_RUNTIME;



// A description of the requirements a device must have in order for a

// resource to be matched and selected.

tools/aapt2/Resources.proto

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import "frameworks/base/tools/aapt2/Configuration.proto"; 
package aapt.pb;



option java_package = "com.android.aapt";

option optimize_for = LITE_RUNTIME;



// A string pool that wraps the binary form of the C++ class android::ResStringPool.

message StringPool {

tools/aapt2/ResourcesInternal.proto

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import "frameworks/base/tools/aapt2/Resources.proto"; 
package aapt.pb.internal;



option java_package = "android.aapt.pb.internal";

option optimize_for = LITE_RUNTIME;



// The top level message representing an external resource file (layout XML, PNG, etc).

// This is used to represent a compiled file before it is linked. Only useful to aapt2.

tools/aapt2/io/Util.cpp

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ bool CopyFileToArchivePreserveCompression(IAaptContext* context, io::IFile* file 
  return CopyFileToArchive(context, file, out_path, compression_flags, writer);

}



bool CopyProtoToArchive(IAaptContext* context, ::google::protobuf::MessageLite* proto_msg,

bool CopyProtoToArchive(IAaptContext* context, ::google::protobuf::Message* proto_msg,

                        const std::string& out_path, uint32_t compression_flags,

                        IArchiveWriter* writer) {

  TRACE_CALL();