commit 58e2fbf16970d9e0c1e93f60b881765e87bfc7a6
author Chris Warrington <cmw@google.com> Mon Jul 23 14:12:20 2018 +0000
committer Izabela Orlowska <imorlowska@google.com> Mon Jul 23 17:23:25 2018 +0100
tree 4ac5c6568a8dd55a61d12346121ebd1dddeed5f7
parent 2e8c7670b12ce7075bcc34c1502d268a71f99a0d

Revert "AAPT2: Automatic Static Library Namespacing."

This reverts commit 481f027ddc3e0ff0e1838a9375c1286e8ad70d70.

Reason for revert: Not needed any more

Bug: 111543815
Test: existing unit and integration tests
Change-Id: I87b039192682636d81c2d33512495cb005c9504d

tools/aapt2/link/XmlReferenceLinker.cpp

diff --git a/tools/aapt2/link/XmlReferenceLinker.cpp b/tools/aapt2/link/XmlReferenceLinker.cpp
index 420a127..160ff92 100644
--- a/tools/aapt2/link/XmlReferenceLinker.cpp
+++ b/tools/aapt2/link/XmlReferenceLinker.cpp
@@ -97,8 +97,8 @@
         attr_ref.private_reference = maybe_package.value().private_namespace;
 
         std::string err_str;
-        attr.compiled_attribute = ReferenceLinker::CompileXmlAttribute(
-            attr_ref, callsite_, symbols_, context_->IsAutoNamespace(), &err_str);
+        attr.compiled_attribute =
+            ReferenceLinker::CompileXmlAttribute(attr_ref, callsite_, symbols_, &err_str);
 
         if (!attr.compiled_attribute) {
           DiagMessage error_msg(source);