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

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

Merge "AAPT2: always say which file failed to compile"

parents 25b35dab a3ab21f0

tools/aapt2/ResourceParser.cpp

+2 −1
Original line number Diff line number Diff line
@@ -714,7 +714,8 @@ bool ResourceParser::ParseResource(xml::XmlPullParser* parser, 
    }

  }



  diag_->Warn(DiagMessage(out_resource->source)

  // If the resource type was not recognized, write the error and return false.

  diag_->Error(DiagMessage(out_resource->source)

              << "unknown resource type '" << parser->element_name() << "'");

  return false;

}

tools/aapt2/cmd/Compile.cpp

+4 −1
Original line number Diff line number Diff line
@@ -701,7 +701,10 @@ int Compile(IAaptContext* context, io::IFileCollection* inputs, IArchiveWriter* 
    }



    const std::string out_path = BuildIntermediateContainerFilename(path_data);

    error |= !compile_func(context, options, path_data, file, output_writer, out_path);

    if (!compile_func(context, options, path_data, file, output_writer, out_path)) {

      context->GetDiagnostics()->Error(DiagMessage(file->GetSource()) << "file failed to compile");

      error = true;

    }

  }



  return error ? 1 : 0;