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

Commit 1536a4b2 authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Fix -Wunused-variable compiler warning" into main am: 76a85e92 am:... 

Merge "Fix -Wunused-variable compiler warning" into main am: 76a85e92 am: a8624586 am: 4314f1e4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2858973



Change-Id: Ide1c481ea8dbca73761d2da1558ab1b305b2da5f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87852020 4314f1e4

tools/aapt2/cmd/Link.cpp

+4 −4
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ ResourceFileFlattener::ResourceFileFlattener(const ResourceFileFlattenerOptions& 
  // Build up the rules for degrading newer attributes to older ones.

  // NOTE(adamlesinski): These rules are hardcoded right now, but they should be

  // generated from the attribute definitions themselves (b/62028956).

  if (const SymbolTable::Symbol* s = symm->FindById(R::attr::paddingHorizontal)) {

  if (symm->FindById(R::attr::paddingHorizontal)) {

    std::vector<ReplacementAttr> replacements{

        {"paddingLeft", R::attr::paddingLeft, Attribute(android::ResTable_map::TYPE_DIMENSION)},

        {"paddingRight", R::attr::paddingRight, Attribute(android::ResTable_map::TYPE_DIMENSION)},
@@ -398,7 +398,7 @@ ResourceFileFlattener::ResourceFileFlattener(const ResourceFileFlattenerOptions& 
        util::make_unique<DegradeToManyRule>(std::move(replacements));

  }



  if (const SymbolTable::Symbol* s = symm->FindById(R::attr::paddingVertical)) {

  if (symm->FindById(R::attr::paddingVertical)) {

    std::vector<ReplacementAttr> replacements{

        {"paddingTop", R::attr::paddingTop, Attribute(android::ResTable_map::TYPE_DIMENSION)},

        {"paddingBottom", R::attr::paddingBottom, Attribute(android::ResTable_map::TYPE_DIMENSION)},
@@ -407,7 +407,7 @@ ResourceFileFlattener::ResourceFileFlattener(const ResourceFileFlattenerOptions& 
        util::make_unique<DegradeToManyRule>(std::move(replacements));

  }



  if (const SymbolTable::Symbol* s = symm->FindById(R::attr::layout_marginHorizontal)) {

  if (symm->FindById(R::attr::layout_marginHorizontal)) {

    std::vector<ReplacementAttr> replacements{

        {"layout_marginLeft", R::attr::layout_marginLeft,

         Attribute(android::ResTable_map::TYPE_DIMENSION)},
@@ -418,7 +418,7 @@ ResourceFileFlattener::ResourceFileFlattener(const ResourceFileFlattenerOptions& 
        util::make_unique<DegradeToManyRule>(std::move(replacements));

  }



  if (const SymbolTable::Symbol* s = symm->FindById(R::attr::layout_marginVertical)) {

  if (symm->FindById(R::attr::layout_marginVertical)) {

    std::vector<ReplacementAttr> replacements{

        {"layout_marginTop", R::attr::layout_marginTop,

         Attribute(android::ResTable_map::TYPE_DIMENSION)},

tools/aapt2/link/ManifestFixer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static bool VerifyUsesFeature(xml::Element* el, android::SourcePathDiagnostics* 
  }



  bool has_gl_es_version = false;

  if (xml::Attribute* attr = el->FindAttribute(xml::kSchemaAndroid, "glEsVersion")) {

  if (el->FindAttribute(xml::kSchemaAndroid, "glEsVersion")) {

    if (has_name) {

      diag->Error(android::DiagMessage(el->line_number)

                  << "cannot define both android:name and android:glEsVersion in <uses-feature>");