diff options
author | 2015-06-12 15:45:48 -0700 | |
---|---|---|
committer | 2015-06-12 17:12:04 -0700 | |
commit | 6cc479b76e9e2e8858434302e1ef2d514ed1b0ec (patch) | |
tree | 3bc2ca1ed297786809dac34b9e0c067586636d8b /tools/aapt2/Linker.cpp | |
parent | 6cb8e30bb7e79cb694bf44d185da201e9deb9363 (diff) |
AAPT2: Remove the need for specifying package name in compile phase
The compile phase doesn't use the AndroidManifest, so we had to specify the
package name on the command line.
We can omit the package name, since we don't resolve external references
in the compile phase. Packages that reference the current package will be encoded
with no package name. When loaded by the link phase, the package name will be supplied
and all the references with no package name will use that one.
Change-Id: I9fe4902b747b06899b45c968f30ba1aa05c5cd69
Diffstat (limited to 'tools/aapt2/Linker.cpp')
-rw-r--r-- | tools/aapt2/Linker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/Linker.cpp b/tools/aapt2/Linker.cpp index f3f04a5f60d0..c37cc932cd3b 100644 --- a/tools/aapt2/Linker.cpp +++ b/tools/aapt2/Linker.cpp @@ -160,7 +160,7 @@ const Attribute* Linker::doResolveAttribute(Reference& attribute, const SourceLi void Linker::visit(Reference& reference, ValueVisitorArgs& a) { Args& args = static_cast<Args&>(a); - if (!reference.name.isValid()) { + if (reference.name.entry.empty()) { // We can't have a completely bad reference. if (!reference.id.isValid()) { Logger::error() << "srsly? " << args.referrer << std::endl; |