Add support for subfolders in assets folders.
authorXavier Ducrohet <xav@android.com>
Tue, 5 Mar 2013 00:39:53 +0000 (16:39 -0800)
committerXavier Ducrohet <xav@android.com>
Tue, 5 Mar 2013 02:56:10 +0000 (18:56 -0800)
commitb133722ee22ae5c0ab58ffd1500191219146e120
treefed35db1e7f34843e09236d381764927320f15ff
parente4fd52f50858dd2a1f01df9243bbfa4b1c5a97fe
Add support for subfolders in assets folders.

Change-Id: Icdae718e8bf3d4c5cadc7e709745cfa1cefc64a4
16 files changed:
builder/src/main/java/com/android/builder/internal/packaging/PackagingUtils.java
builder/src/main/java/com/android/builder/resources/AssetItem.java
builder/src/main/java/com/android/builder/resources/AssetMerger.java
builder/src/main/java/com/android/builder/resources/AssetSet.java
builder/src/main/java/com/android/builder/resources/DataSet.java
builder/src/main/java/com/android/builder/resources/ResourceSet.java
builder/src/test/java/com/android/builder/resources/AssetMergerTest.java
builder/src/test/java/com/android/builder/resources/AssetSetTest.java
builder/src/test/resources/testData/assets/baseMerge/merger.xml
builder/src/test/resources/testData/assets/baseMerge/overlay/foo/icon.png [moved from builder/src/test/resources/testData/assets/baseMerge/overlay/icon.png with 100% similarity]
builder/src/test/resources/testData/assets/baseSet/foo/foo.dat [moved from builder/src/test/resources/testData/assets/baseSet/foo.dat with 100% similarity]
builder/src/test/resources/testData/assets/baseSet/foo/icon.png [moved from builder/src/test/resources/testData/assets/baseSet/icon.png with 100% similarity]
builder/src/test/resources/testData/assets/incMergeData/basicFiles/assetOut/foo/overlay_added.png [moved from builder/src/test/resources/testData/assets/incMergeData/basicFiles/assetOut/overlay_added.png with 100% similarity]
builder/src/test/resources/testData/assets/incMergeData/basicFiles/main/foo/overlay_added.png [moved from builder/src/test/resources/testData/assets/incMergeData/basicFiles/main/overlay_added.png with 100% similarity]
builder/src/test/resources/testData/assets/incMergeData/basicFiles/merger.xml
builder/src/test/resources/testData/assets/incMergeData/basicFiles/overlay/foo/overlay_added.png [moved from builder/src/test/resources/testData/assets/incMergeData/basicFiles/overlay/overlay_added.png with 100% similarity]