6f6ceb7e14
First checking of AAPT2. The individual phases of AAPT2 work, but there
are some missing pieces.
For early testing we are missing:
- Need to properly mark file references and include them in package
- Need to package into zip
Final AAPT for apps we are missing:
- Need to crush PNGs
- Need to parse 9-patches
- Need to validate all of AndroidManifest.xml
- Need to write align method to align resource tables for splits.
Final AAPT for apps + system we are missing:
- Need to handle overlays
- Need to store comments for R file
- Need to handle --shared-lib (dynamic references too).
New AAPT features coming:
- Need to import compiled libraries
- Name mangling
- R file generation for library code
Change-Id: I95f8a63581b81a1f424ae6fb2c373c883b72c18d
98 lines
2.4 KiB
C++
98 lines
2.4 KiB
C++
/*
|
|
* Copyright (C) 2015 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
#include "Logger.h"
|
|
#include "Source.h"
|
|
|
|
#include <memory>
|
|
#include <iostream>
|
|
|
|
namespace aapt {
|
|
|
|
Log::Log(std::ostream& _out, std::ostream& _err) : out(_out), err(_err) {
|
|
}
|
|
|
|
std::shared_ptr<Log> Logger::sLog(std::make_shared<Log>(std::cerr, std::cerr));
|
|
|
|
void Logger::setLog(const std::shared_ptr<Log>& log) {
|
|
sLog = log;
|
|
}
|
|
|
|
std::ostream& Logger::error() {
|
|
return sLog->err << "error: ";
|
|
}
|
|
|
|
std::ostream& Logger::error(const Source& source) {
|
|
return sLog->err << source << ": error: ";
|
|
}
|
|
|
|
std::ostream& Logger::error(const SourceLine& source) {
|
|
return sLog->err << source << ": error: ";
|
|
}
|
|
|
|
std::ostream& Logger::warn() {
|
|
return sLog->err << "warning: ";
|
|
}
|
|
|
|
std::ostream& Logger::warn(const Source& source) {
|
|
return sLog->err << source << ": warning: ";
|
|
}
|
|
|
|
std::ostream& Logger::warn(const SourceLine& source) {
|
|
return sLog->err << source << ": warning: ";
|
|
}
|
|
|
|
std::ostream& Logger::note() {
|
|
return sLog->out << "note: ";
|
|
}
|
|
|
|
std::ostream& Logger::note(const Source& source) {
|
|
return sLog->err << source << ": note: ";
|
|
}
|
|
|
|
std::ostream& Logger::note(const SourceLine& source) {
|
|
return sLog->err << source << ": note: ";
|
|
}
|
|
|
|
SourceLogger::SourceLogger(const Source& source)
|
|
: mSource(source) {
|
|
}
|
|
|
|
std::ostream& SourceLogger::error() {
|
|
return Logger::error(mSource);
|
|
}
|
|
|
|
std::ostream& SourceLogger::error(size_t line) {
|
|
return Logger::error(SourceLine{ mSource.path, line });
|
|
}
|
|
|
|
std::ostream& SourceLogger::warn() {
|
|
return Logger::warn(mSource);
|
|
}
|
|
|
|
std::ostream& SourceLogger::warn(size_t line) {
|
|
return Logger::warn(SourceLine{ mSource.path, line });
|
|
}
|
|
|
|
std::ostream& SourceLogger::note() {
|
|
return Logger::note(mSource);
|
|
}
|
|
|
|
std::ostream& SourceLogger::note(size_t line) {
|
|
return Logger::note(SourceLine{ mSource.path, line });
|
|
}
|
|
|
|
} // namespace aapt
|