c5853da4c15e8b4e153d572282a317d81fd7a9cc - platform/tools/base

commit	c5853da4c15e8b4e153d572282a317d81fd7a9cc	[log] [tgz]
author	Xavier Ducrohet <xav@android.com>	Thu Apr 04 12:28:57 2013 -0700
committer	Xavier Ducrohet <xav@android.com>	Thu Apr 04 12:28:57 2013 -0700
tree	a91fe850818cf6bb20975331bd03e2b86cd7db77
parent	c6b4e6bcf47320deffb6c706128b8632e3695cd2 [diff]

Move the resource/asset merger to sdk-common

Also move some required classes to sdk-common and testutils.

Change-Id: I0ad4d18c58a7568da8fa4e309e6ed6265d7d7865

sdk-common/build.gradle[diff]
sdk-common/sdk-common.iml[diff]
sdk-common/src/main/java/com/android/ide/common/internal/AaptRunner.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/internal/CommandLineRunner.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/internal/WaitableExecutor.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/packaging/PackagingUtils.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/AssetFile.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/AssetItem.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/AssetMerger.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/AssetSet.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/DataFile.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/DataItem.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/DataMap.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/DataMerger.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/DataSet.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/DuplicateDataException.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/FileStatus.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/NodeUtils.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/ResourceFile.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/ResourceItem.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/ResourceMerger.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/ResourceSet.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/SourceSet.java[Added - diff]
sdk-common/src/main/java/com/android/ide/common/res2/ValueResourceParser2.java[Added - diff]
sdk-common/src/test/java/com/android/ide/common/res2/AssetMergerTest.java[Added - diff]
sdk-common/src/test/java/com/android/ide/common/res2/AssetSetTest.java[Added - diff]
sdk-common/src/test/java/com/android/ide/common/res2/BaseTestCase.java[Added - diff]
sdk-common/src/test/java/com/android/ide/common/res2/NodeUtilsTest.java[Added - diff]
sdk-common/src/test/java/com/android/ide/common/res2/RecordingLogger.java[Added - diff]
sdk-common/src/test/java/com/android/ide/common/res2/ResourceMergerTest.java[Added - diff]
sdk-common/src/test/java/com/android/ide/common/res2/ResourceSetTest.java[Added - diff]
sdk-common/src/test/java/com/android/ide/common/res2/ValueResourceParser2Test.java[Added - diff]
sdk-common/src/test/resources/testData/assets/baseMerge/merger.xml[Added - diff]
sdk-common/src/test/resources/testData/assets/baseMerge/overlay/foo/icon.png[Added - diff]
sdk-common/src/test/resources/testData/assets/baseMerge/overlay/icon2.png[Added - diff]
sdk-common/src/test/resources/testData/assets/baseSet/foo/foo.dat[Added - diff]
sdk-common/src/test/resources/testData/assets/baseSet/foo/icon.png[Added - diff]
sdk-common/src/test/resources/testData/assets/baseSet/main.xml[Added - diff]
sdk-common/src/test/resources/testData/assets/baseSet/values.xml[Added - diff]
sdk-common/src/test/resources/testData/assets/dupSet/assets1/icon.png[Added - diff]
sdk-common/src/test/resources/testData/assets/dupSet/assets2/icon.png[Added - diff]
sdk-common/src/test/resources/testData/assets/incMergeData/basicFiles/assetOut/foo/overlay_added.png[Added - diff]
sdk-common/src/test/resources/testData/assets/incMergeData/basicFiles/assetOut/overlay_removed.png[Added - diff]
sdk-common/src/test/resources/testData/assets/incMergeData/basicFiles/assetOut/removed.png[Added - diff]
sdk-common/src/test/resources/testData/assets/incMergeData/basicFiles/assetOut/touched.png[Added - diff]
sdk-common/src/test/resources/testData/assets/incMergeData/basicFiles/assetOut/untouched.png[Added - diff]
sdk-common/src/test/resources/testData/assets/incMergeData/basicFiles/main/added.png[Added - diff]
sdk-common/src/test/resources/testData/assets/incMergeData/basicFiles/main/foo/overlay_added.png[Added - diff]
sdk-common/src/test/resources/testData/assets/incMergeData/basicFiles/main/overlay_removed.png[Added - diff]
sdk-common/src/test/resources/testData/assets/incMergeData/basicFiles/main/touched.png[Added - diff]
sdk-common/src/test/resources/testData/assets/incMergeData/basicFiles/main/untouched.png[Added - diff]
sdk-common/src/test/resources/testData/assets/incMergeData/basicFiles/merger.xml[Added - diff]
sdk-common/src/test/resources/testData/assets/incMergeData/basicFiles/overlay/foo/overlay_added.png[Added - diff]
sdk-common/src/test/resources/testData/resources/baseMerge/merger.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/baseMerge/overlay/drawable-ldpi/icon.png[Added - diff]
sdk-common/src/test/resources/testData/resources/baseMerge/overlay/drawable/icon2.png[Added - diff]
sdk-common/src/test/resources/testData/resources/baseMerge/overlay/layout/alias_replaced_by_file.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/baseMerge/overlay/layout/main.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/baseMerge/overlay/values/values.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/baseSet/drawable/icon.png[Added - diff]
sdk-common/src/test/resources/testData/resources/baseSet/drawable/patch.9.png[Added - diff]
sdk-common/src/test/resources/testData/resources/baseSet/layout/file_replaced_by_alias.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/baseSet/layout/main.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/baseSet/raw/foo.dat[Added - diff]
sdk-common/src/test/resources/testData/resources/baseSet/values/values.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/brokenSet/layout/activity_main.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/brokenSet/values/dimens.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/dupSet/res1/drawable/icon.png[Added - diff]
sdk-common/src/test/resources/testData/resources/dupSet/res2/drawable/icon.png[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicFiles/main/drawable/new_overlay.png[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicFiles/main/drawable/removed_overlay.png[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicFiles/main/drawable/touched.png[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicFiles/main/drawable/untouched.png[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicFiles/merger.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicFiles/new_overlay.png[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicFiles/overlay/drawable-hdpi/new_alternate.png[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicFiles/overlay/drawable/new_overlay.png[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicFiles/resOut/drawable-ldpi/removed.png[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicFiles/resOut/drawable/new_overlay.png[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicFiles/resOut/drawable/removed_overlay.png[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicFiles/resOut/drawable/touched.png[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicFiles/resOut/drawable/untouched.png[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicValues/main/values/values.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicValues/merger.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicValues/overlay/values-fr/values.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicValues/overlay/values/values.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicValues/resOut/values-en/values.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicValues/resOut/values/values.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicValues2/main/values/values.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicValues2/merger.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicValues2/overlay/keepfolder.txt[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/basicValues2/resOut/values/values.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/filesVsValues/main/layout/alias_replaced_by_file.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/filesVsValues/main/layout/main.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/filesVsValues/main/values/values.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/filesVsValues/merger.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/filesVsValues/resOut/layout/file_replaced_by_alias.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/filesVsValues/resOut/layout/main.xml[Added - diff]
sdk-common/src/test/resources/testData/resources/incMergeData/filesVsValues/resOut/values/values.xml[Added - diff]
testutils/build.gradle[diff]
testutils/src/main/java/com/android/testutils/TestUtils.java[Added - diff]

101 files changed

tree: a91fe850818cf6bb20975331bd03e2b86cd7db77