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

Commit 3b3be3f1 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix/suppress aapt/aapt2 google-explicit-constructor warnings" am: cdf6be57 am: d42fe48c 

am: 0bf62f13

Change-Id: Iffb7e4a145b172a35dd58b9450d4a5184d8b07f7
parents e2ad62f7 0bf62f13

tools/aapt/ConfigDescription.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct ConfigDescription : public android::ResTable_config { 
        size = sizeof(android::ResTable_config);

    }



    ConfigDescription(const android::ResTable_config&o) {  // NOLINT(implicit)

    ConfigDescription(const android::ResTable_config&o) {  // NOLINT(google-explicit-constructor)

        *static_cast<android::ResTable_config*>(this) = o;

        size = sizeof(android::ResTable_config);

    }

tools/aapt2/Debug.cpp

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ class XmlPrinter : public xml::ConstVisitor { 
 public:

  using xml::ConstVisitor::Visit;



  XmlPrinter(Printer* printer) : printer_(printer) {

  explicit XmlPrinter(Printer* printer) : printer_(printer) {

  }



  void Visit(const xml::Element* el) override {

tools/aapt2/Resource.h

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ struct ResourceNameRef { 
  ResourceNameRef() = default;

  ResourceNameRef(const ResourceNameRef&) = default;

  ResourceNameRef(ResourceNameRef&&) = default;

  ResourceNameRef(const ResourceName& rhs);  // NOLINT(implicit)

  ResourceNameRef(const ResourceName& rhs);  // NOLINT(google-explicit-constructor)

  ResourceNameRef(const android::StringPiece& p, ResourceType t, const android::StringPiece& e);

  ResourceNameRef& operator=(const ResourceNameRef& rhs) = default;

  ResourceNameRef& operator=(ResourceNameRef&& rhs) = default;
@@ -144,7 +144,7 @@ struct ResourceId { 


  ResourceId();

  ResourceId(const ResourceId& rhs);

  ResourceId(uint32_t res_id);  // NOLINT(implicit)

  ResourceId(uint32_t res_id);  // NOLINT(google-explicit-constructor)

  ResourceId(uint8_t p, uint8_t t, uint16_t e);



  bool is_valid() const;

tools/aapt2/cmd/Compile.cpp

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static bool CompileFile(IAaptContext* context, const CompileOptions& options, 


class CompileContext : public IAaptContext {

 public:

  CompileContext(IDiagnostics* diagnostics) : diagnostics_(diagnostics) {

  explicit CompileContext(IDiagnostics* diagnostics) : diagnostics_(diagnostics) {

  }



  PackageType GetPackageType() override {

tools/aapt2/cmd/Link.cpp

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ namespace aapt { 


class LinkContext : public IAaptContext {

 public:

  LinkContext(IDiagnostics* diagnostics)

  explicit LinkContext(IDiagnostics* diagnostics)

      : diagnostics_(diagnostics), name_mangler_({}), symbols_(&name_mangler_) {

  }
@@ -163,7 +163,7 @@ class LinkContext : public IAaptContext { 
// See b/37498913.

class FeatureSplitSymbolTableDelegate : public DefaultSymbolTableDelegate {

 public:

  FeatureSplitSymbolTableDelegate(IAaptContext* context) : context_(context) {

  explicit FeatureSplitSymbolTableDelegate(IAaptContext* context) : context_(context) {

  }



  virtual ~FeatureSplitSymbolTableDelegate() = default;