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
86 lines
2.0 KiB
C++
86 lines
2.0 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.
|
|
*/
|
|
|
|
#ifndef AAPT_SOURCE_H
|
|
#define AAPT_SOURCE_H
|
|
|
|
#include <ostream>
|
|
#include <string>
|
|
|
|
namespace aapt {
|
|
|
|
struct SourceLineColumn;
|
|
struct SourceLine;
|
|
|
|
/**
|
|
* Represents a file on disk. Used for logging and
|
|
* showing errors.
|
|
*/
|
|
struct Source {
|
|
std::string path;
|
|
|
|
inline SourceLine line(size_t line) const;
|
|
};
|
|
|
|
/**
|
|
* Represents a file on disk and a line number in that file.
|
|
* Used for logging and showing errors.
|
|
*/
|
|
struct SourceLine {
|
|
std::string path;
|
|
size_t line;
|
|
|
|
inline SourceLineColumn column(size_t column) const;
|
|
};
|
|
|
|
/**
|
|
* Represents a file on disk and a line:column number in that file.
|
|
* Used for logging and showing errors.
|
|
*/
|
|
struct SourceLineColumn {
|
|
std::string path;
|
|
size_t line;
|
|
size_t column;
|
|
};
|
|
|
|
//
|
|
// Implementations
|
|
//
|
|
|
|
SourceLine Source::line(size_t line) const {
|
|
return SourceLine{ path, line };
|
|
}
|
|
|
|
SourceLineColumn SourceLine::column(size_t column) const {
|
|
return SourceLineColumn{ path, line, column };
|
|
}
|
|
|
|
inline ::std::ostream& operator<<(::std::ostream& out, const Source& source) {
|
|
return out << source.path;
|
|
}
|
|
|
|
inline ::std::ostream& operator<<(::std::ostream& out, const SourceLine& source) {
|
|
return out << source.path << ":" << source.line;
|
|
}
|
|
|
|
inline ::std::ostream& operator<<(::std::ostream& out, const SourceLineColumn& source) {
|
|
return out << source.path << ":" << source.line << ":" << source.column;
|
|
}
|
|
|
|
} // namespace aapt
|
|
|
|
#endif // AAPT_SOURCE_H
|