Refactor manifestmerger folder structure.

Move folders around to match default gradle/maven
folder structure.

The custom structure confused some IDEs when importing
the project as a Gradle project.

Change-Id: Iac1bcbeaaf2928681707f809c3718b87f7c5334a

51 files changed, 18 insertions, 48 deletions

diff --git a/manifmerger/.classpath b/manifmerger/.classpath
index d042f23..c0005b9 100644
--- a/manifmerger/.classpath
+++ b/manifmerger/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**/Android.mk" kind="src" path="src"/>
-	<classpathentry kind="src" path="tests/src"/>
+	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/SdkLib"/>
diff --git a/manifmerger/Android.mk b/manifmerger/Android.mk
index 093d5b3..28dbe82 100644
--- a/manifmerger/Android.mk
+++ b/manifmerger/Android.mk
@@ -3,10 +3,9 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java)
 LOCAL_JAVA_RESOURCE_DIRS :=
 
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
-
 LOCAL_JAR_MANIFEST := etc/manifest.txt
 LOCAL_JAVA_LIBRARIES :=  \
 	common \
@@ -15,3 +14,17 @@ LOCAL_MODULE := manifmerger
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_JAVA_LIBRARY)
+
+# Build tests
+include $(CLEAR_VARS)
+
+# Only compile source java files in this lib.
+LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java)
+LOCAL_JAVA_RESOURCE_DIRS := src/test/java
+
+LOCAL_MODULE := manifmerger-tests
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_JAVA_LIBRARIES := manifmerger sdklib-tests junit
+
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/manifmerger/build.gradle b/manifmerger/build.gradle
index 1db9c04..9e9bef2 100644
--- a/manifmerger/build.gradle
+++ b/manifmerger/build.gradle
@@ -20,22 +20,8 @@ group = 'com.android.tools.build'
 archivesBaseName = 'manifest-merger'
 
 sourceSets {
-    main {
-        java {
-            srcDir 'src'
-        }
-        resources {
-            srcDir 'src'
-        }
-    }
-    test {
-        java {
-            srcDir 'tests/src'
-        }
-        resources {
-            srcDir 'tests/src'
-        }
-    }
+    main.resources.srcDir 'src/main/java'
+    test.resources.srcDir 'src/test/java'
 }
 
 uploadArchives {
diff --git a/manifmerger/src/com/android/manifmerger/ArgvParser.java b/manifmerger/src/main/java/com/android/manifmerger/ArgvParser.java
index 6d22f57..6d22f57 100755
--- a/manifmerger/src/com/android/manifmerger/ArgvParser.java
+++ b/manifmerger/src/main/java/com/android/manifmerger/ArgvParser.java
diff --git a/manifmerger/src/com/android/manifmerger/ICallback.java b/manifmerger/src/main/java/com/android/manifmerger/ICallback.java
index 26ae40d..26ae40d 100755
--- a/manifmerger/src/com/android/manifmerger/ICallback.java
+++ b/manifmerger/src/main/java/com/android/manifmerger/ICallback.java
diff --git a/manifmerger/src/com/android/manifmerger/IMergerLog.java b/manifmerger/src/main/java/com/android/manifmerger/IMergerLog.java
index 5402dd4..5402dd4 100755
--- a/manifmerger/src/com/android/manifmerger/IMergerLog.java
+++ b/manifmerger/src/main/java/com/android/manifmerger/IMergerLog.java
diff --git a/manifmerger/src/com/android/manifmerger/Main.java b/manifmerger/src/main/java/com/android/manifmerger/Main.java
index 2a6460e..2a6460e 100644
--- a/manifmerger/src/com/android/manifmerger/Main.java
+++ b/manifmerger/src/main/java/com/android/manifmerger/Main.java
diff --git a/manifmerger/src/com/android/manifmerger/ManifestMerger.java b/manifmerger/src/main/java/com/android/manifmerger/ManifestMerger.java
index 073c768..073c768 100755
--- a/manifmerger/src/com/android/manifmerger/ManifestMerger.java
+++ b/manifmerger/src/main/java/com/android/manifmerger/ManifestMerger.java
diff --git a/manifmerger/src/com/android/manifmerger/MergerLog.java b/manifmerger/src/main/java/com/android/manifmerger/MergerLog.java
index 446898c..446898c 100755
--- a/manifmerger/src/com/android/manifmerger/MergerLog.java
+++ b/manifmerger/src/main/java/com/android/manifmerger/MergerLog.java
diff --git a/manifmerger/src/com/android/manifmerger/MergerXmlUtils.java b/manifmerger/src/main/java/com/android/manifmerger/MergerXmlUtils.java
index bb60464..bb60464 100755
--- a/manifmerger/src/com/android/manifmerger/MergerXmlUtils.java
+++ b/manifmerger/src/main/java/com/android/manifmerger/MergerXmlUtils.java
diff --git a/manifmerger/tests/src/com/android/manifmerger/ManifestMergerTest.java b/manifmerger/src/test/java/com/android/manifmerger/ManifestMergerTest.java
index 6da0bb9..6da0bb9 100755
--- a/manifmerger/tests/src/com/android/manifmerger/ManifestMergerTest.java
+++ b/manifmerger/src/test/java/com/android/manifmerger/ManifestMergerTest.java
diff --git a/manifmerger/tests/src/com/android/manifmerger/ManifestMergerTestCase.java b/manifmerger/src/test/java/com/android/manifmerger/ManifestMergerTestCase.java
index eb3a215..eb3a215 100755
--- a/manifmerger/tests/src/com/android/manifmerger/ManifestMergerTestCase.java
+++ b/manifmerger/src/test/java/com/android/manifmerger/ManifestMergerTestCase.java
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/00_noop.xml b/manifmerger/src/test/java/com/android/manifmerger/data/00_noop.xml
index 2160f69..2160f69 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/00_noop.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/00_noop.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/01_ignore_app_attr.xml b/manifmerger/src/test/java/com/android/manifmerger/data/01_ignore_app_attr.xml
index b939dd7..b939dd7 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/01_ignore_app_attr.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/01_ignore_app_attr.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/02_ignore_instrumentation.xml b/manifmerger/src/test/java/com/android/manifmerger/data/02_ignore_instrumentation.xml
index ed0dbbc..ed0dbbc 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/02_ignore_instrumentation.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/02_ignore_instrumentation.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/03_inject_attributes.xml b/manifmerger/src/test/java/com/android/manifmerger/data/03_inject_attributes.xml
index 0a7057c..0a7057c 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/03_inject_attributes.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/03_inject_attributes.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/04_inject_attributes.xml b/manifmerger/src/test/java/com/android/manifmerger/data/04_inject_attributes.xml
index 57f4e84..57f4e84 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/04_inject_attributes.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/04_inject_attributes.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/10_activity_merge.xml b/manifmerger/src/test/java/com/android/manifmerger/data/10_activity_merge.xml
index 59c5c42..59c5c42 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/10_activity_merge.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/10_activity_merge.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/11_activity_dup.xml b/manifmerger/src/test/java/com/android/manifmerger/data/11_activity_dup.xml
index ef163b0..ef163b0 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/11_activity_dup.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/11_activity_dup.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/12_alias_dup.xml b/manifmerger/src/test/java/com/android/manifmerger/data/12_alias_dup.xml
index 7b5aed3..7b5aed3 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/12_alias_dup.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/12_alias_dup.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/13_service_dup.xml b/manifmerger/src/test/java/com/android/manifmerger/data/13_service_dup.xml
index 4c257fa..4c257fa 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/13_service_dup.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/13_service_dup.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/14_receiver_dup.xml b/manifmerger/src/test/java/com/android/manifmerger/data/14_receiver_dup.xml
index 777ba22..777ba22 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/14_receiver_dup.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/14_receiver_dup.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/15_provider_dup.xml b/manifmerger/src/test/java/com/android/manifmerger/data/15_provider_dup.xml
index bd0c8fe..bd0c8fe 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/15_provider_dup.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/15_provider_dup.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/16_fqcn_merge.xml b/manifmerger/src/test/java/com/android/manifmerger/data/16_fqcn_merge.xml
index 8414a3c..8414a3c 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/16_fqcn_merge.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/16_fqcn_merge.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/17_fqcn_conflict.xml b/manifmerger/src/test/java/com/android/manifmerger/data/17_fqcn_conflict.xml
index b4f5ea0..b4f5ea0 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/17_fqcn_conflict.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/17_fqcn_conflict.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/20_uses_lib_merge.xml b/manifmerger/src/test/java/com/android/manifmerger/data/20_uses_lib_merge.xml
index a5eecce..a5eecce 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/20_uses_lib_merge.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/20_uses_lib_merge.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/21_uses_lib_errors.xml b/manifmerger/src/test/java/com/android/manifmerger/data/21_uses_lib_errors.xml
index 9e8f5a0..9e8f5a0 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/21_uses_lib_errors.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/21_uses_lib_errors.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/25_permission_merge.xml b/manifmerger/src/test/java/com/android/manifmerger/data/25_permission_merge.xml
index 07208ad..07208ad 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/25_permission_merge.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/25_permission_merge.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/26_permission_dup.xml b/manifmerger/src/test/java/com/android/manifmerger/data/26_permission_dup.xml
index bd9a4f1..bd9a4f1 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/26_permission_dup.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/26_permission_dup.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/28_uses_perm_merge.xml b/manifmerger/src/test/java/com/android/manifmerger/data/28_uses_perm_merge.xml
index ecc644a..ecc644a 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/28_uses_perm_merge.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/28_uses_perm_merge.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/30_uses_sdk_ok.xml b/manifmerger/src/test/java/com/android/manifmerger/data/30_uses_sdk_ok.xml
index bcee4ce..bcee4ce 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/30_uses_sdk_ok.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/30_uses_sdk_ok.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/32_uses_sdk_minsdk_ok.xml b/manifmerger/src/test/java/com/android/manifmerger/data/32_uses_sdk_minsdk_ok.xml
index b94efe8..b94efe8 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/32_uses_sdk_minsdk_ok.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/32_uses_sdk_minsdk_ok.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/33_uses_sdk_minsdk_conflict.xml b/manifmerger/src/test/java/com/android/manifmerger/data/33_uses_sdk_minsdk_conflict.xml
index 8edbedb..8edbedb 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/33_uses_sdk_minsdk_conflict.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/33_uses_sdk_minsdk_conflict.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/36_uses_sdk_targetsdk_warning.xml b/manifmerger/src/test/java/com/android/manifmerger/data/36_uses_sdk_targetsdk_warning.xml
index df8b717..df8b717 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/36_uses_sdk_targetsdk_warning.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/36_uses_sdk_targetsdk_warning.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/40_uses_feat_merge.xml b/manifmerger/src/test/java/com/android/manifmerger/data/40_uses_feat_merge.xml
index d14dcaa..d14dcaa 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/40_uses_feat_merge.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/40_uses_feat_merge.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/41_uses_feat_errors.xml b/manifmerger/src/test/java/com/android/manifmerger/data/41_uses_feat_errors.xml
index b86f74a..b86f74a 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/41_uses_feat_errors.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/41_uses_feat_errors.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/45_uses_feat_gles_once.xml b/manifmerger/src/test/java/com/android/manifmerger/data/45_uses_feat_gles_once.xml
index 57937a6..57937a6 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/45_uses_feat_gles_once.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/45_uses_feat_gles_once.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/47_uses_feat_gles_conflict.xml b/manifmerger/src/test/java/com/android/manifmerger/data/47_uses_feat_gles_conflict.xml
index 936d009..936d009 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/47_uses_feat_gles_conflict.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/47_uses_feat_gles_conflict.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/50_uses_conf_warning.xml b/manifmerger/src/test/java/com/android/manifmerger/data/50_uses_conf_warning.xml
index b1cb3f9..b1cb3f9 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/50_uses_conf_warning.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/50_uses_conf_warning.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/52_support_screens_warning.xml b/manifmerger/src/test/java/com/android/manifmerger/data/52_support_screens_warning.xml
index 363fb2b..363fb2b 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/52_support_screens_warning.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/52_support_screens_warning.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/54_compat_screens_warning.xml b/manifmerger/src/test/java/com/android/manifmerger/data/54_compat_screens_warning.xml
index 1e1c2d2..1e1c2d2 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/54_compat_screens_warning.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/54_compat_screens_warning.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/56_support_gltext_warning.xml b/manifmerger/src/test/java/com/android/manifmerger/data/56_support_gltext_warning.xml
index 114e9f4..114e9f4 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/56_support_gltext_warning.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/56_support_gltext_warning.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/60_merge_order.xml b/manifmerger/src/test/java/com/android/manifmerger/data/60_merge_order.xml
index d6767f7..d6767f7 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/60_merge_order.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/60_merge_order.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/65_override_app.xml b/manifmerger/src/test/java/com/android/manifmerger/data/65_override_app.xml
index 464b52f..464b52f 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/65_override_app.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/65_override_app.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/66_remove_app.xml b/manifmerger/src/test/java/com/android/manifmerger/data/66_remove_app.xml
index a1b04b5..a1b04b5 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/66_remove_app.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/66_remove_app.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/67_override_activities.xml b/manifmerger/src/test/java/com/android/manifmerger/data/67_override_activities.xml
index 8bcdb63..8bcdb63 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/67_override_activities.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/67_override_activities.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/68_override_uses.xml b/manifmerger/src/test/java/com/android/manifmerger/data/68_override_uses.xml
index a43d13e..a43d13e 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/68_override_uses.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/68_override_uses.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/69_remove_uses.xml b/manifmerger/src/test/java/com/android/manifmerger/data/69_remove_uses.xml
index c3e46c9..c3e46c9 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/69_remove_uses.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/69_remove_uses.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/70_expand_fqcns.xml b/manifmerger/src/test/java/com/android/manifmerger/data/70_expand_fqcns.xml
index 5864345..5864345 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/70_expand_fqcns.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/70_expand_fqcns.xml
diff --git a/manifmerger/tests/src/com/android/manifmerger/data/71_prefixes_enable_extractprefix.xml b/manifmerger/src/test/java/com/android/manifmerger/data/71_prefixes_enable_extractprefix.xml
index dd11dcc..dd11dcc 100755
--- a/manifmerger/tests/src/com/android/manifmerger/data/71_prefixes_enable_extractprefix.xml
+++ b/manifmerger/src/test/java/com/android/manifmerger/data/71_prefixes_enable_extractprefix.xml
diff --git a/manifmerger/tests/Android.mk b/manifmerger/tests/Android.mk
deleted file mode 100755
index 9314106..0000000
--- a/manifmerger/tests/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# Only compile source java files in this lib.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_RESOURCE_DIRS := src
-
-LOCAL_MODULE := manifmerger-tests
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_JAVA_LIBRARIES := manifmerger sdklib-tests junit
-
-include $(BUILD_HOST_JAVA_LIBRARY)