From: Jean-Baptiste Queru <jbq@google.com>
Date: Thu, 23 Feb 2012 20:57:03 +0000 (-0800)
Subject: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/6abdeb6036680346dbd1b3bc1f4cd97f91cf2a8f?hp=--cc

am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"

* commit '63e43ba56a95708c229eec539a544967f1bbb7d7':
  Fix for issue 9656 - custom xml attributes in Android Libraries
---

6abdeb6036680346dbd1b3bc1f4cd97f91cf2a8f
diff --cc XMLNode.cpp
index 95a68d1,d9782b0..9ee6c84
--- a/XMLNode.cpp
+++ b/XMLNode.cpp
@@@ -44,10 -45,10 +45,11 @@@ bool isWhitespace(const char16_t* str
  }
  
  static const String16 RESOURCES_PREFIX(RESOURCES_ROOT_NAMESPACE);
+ static const String16 RESOURCES_PREFIX_AUTO_PACKAGE(RESOURCES_AUTO_PACKAGE_NAMESPACE);
  static const String16 RESOURCES_PRV_PREFIX(RESOURCES_ROOT_PRV_NAMESPACE);
 +static const String16 RESOURCES_TOOLS_NAMESPACE("http://schemas.android.com/tools");
  
- String16 getNamespaceResourcePackage(String16 namespaceUri, bool* outIsPublic)
+ String16 getNamespaceResourcePackage(String16 appPackage, String16 namespaceUri, bool* outIsPublic)
  {
      //printf("%s starts with %s?\n", String8(namespaceUri).string(),
      //       String8(RESOURCES_PREFIX).string());