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

Commit a3ab21f0 authored by Izabela Orlowska's avatar Izabela Orlowska
Browse files

AAPT2: always say which file failed to compile 

Sometimes AAPT2 doesn't include the path of the file in the error
message, or just outputs a warning where an error should be printed
(but the overall build still fails without an error message). Let's
always include the file path to make it easier for the users to find out
the source of the failure.

Fixes: 122856772
Test: manual
Change-Id: Ibbbfd21b372792e5eaa40278186eb64cdfb0f60e
parent 352ed665

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;