Merge "AAPT2: Expose split support to command line"

diff --cc tools/aapt2/ResourceUtils.cpp
index 773616d,f806d80..11619fa
--- 1/tools/aapt2/ResourceUtils.cpp
--- 2/tools/aapt2/ResourceUtils.cpp
+++ b/tools/aapt2/ResourceUtils.cpp
@@@ -542,10 -544,10 +544,10 @@@ uint32_t androidTypeToAttributeTypeMask
      };
  }
  
- std::unique_ptr<Item> parseItemForAttribute(
+ std::unique_ptr<Item> tryParseItemForAttribute(
          const StringPiece& value,
          uint32_t typeMask,
 -        std::function<void(const ResourceName&)> onCreateReference) {
 +        const std::function<void(const ResourceName&)>& onCreateReference) {
      std::unique_ptr<BinaryPrimitive> nullOrEmpty = tryParseNullOrEmpty(value);
      if (nullOrEmpty) {
          return std::move(nullOrEmpty);
@@@ -602,11 -604,11 +604,11 @@@
   * We successively try to parse the string as a resource type that the Attribute
   * allows.
   */
- std::unique_ptr<Item> parseItemForAttribute(
+ std::unique_ptr<Item> tryParseItemForAttribute(
          const StringPiece& str, const Attribute* attr,
 -        std::function<void(const ResourceName&)> onCreateReference) {
 +        const std::function<void(const ResourceName&)>& onCreateReference) {
      const uint32_t typeMask = attr->typeMask;
-     std::unique_ptr<Item> value = parseItemForAttribute(str, typeMask, onCreateReference);
+     std::unique_ptr<Item> value = tryParseItemForAttribute(str, typeMask, onCreateReference);
      if (value) {
          return value;
      }

diff --cc tools/aapt2/ResourceUtils.h
index a57d89d,00a1390..244047b
--- 1/tools/aapt2/ResourceUtils.h
--- 2/tools/aapt2/ResourceUtils.h
+++ b/tools/aapt2/ResourceUtils.h
@@@ -161,13 -166,13 +166,13 @@@ std::unique_ptr<BinaryPrimitive> tryPar
   * The callback function onCreateReference is called when the parsed item is a
   * reference to an ID that must be created (@+id/foo).
   */
- std::unique_ptr<Item> parseItemForAttribute(
+ std::unique_ptr<Item> tryParseItemForAttribute(
          const StringPiece& value, const Attribute* attr,
 -        std::function<void(const ResourceName&)> onCreateReference = {});
 +        const std::function<void(const ResourceName&)>& onCreateReference = {});
  
- std::unique_ptr<Item> parseItemForAttribute(
+ std::unique_ptr<Item> tryParseItemForAttribute(
          const StringPiece& value, uint32_t typeMask,
 -        std::function<void(const ResourceName&)> onCreateReference = {});
 +        const std::function<void(const ResourceName&)>& onCreateReference = {});
  
  uint32_t androidTypeToAttributeTypeMask(uint16_t type);
  

diff --cc tools/aapt2/link/Link.cpp
Simple merge