[SetupWizardLib] Changed project hierarchy

Moved res-ics to ics/res, and res, src, AndroidManifest to main/.
This fits more to the "canonical layout" expected by gradle, and
works around the issue where blaze is expecting every res directory
used by a target to be named the same (including its library
dependencies and its transitive dependencies).

Change-Id: I658e3c0a67a01f379c43d3fad82cd40f9aa8cd28

library/Android.mk

@@ -2,8 +2,9 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SDK_VERSION := current
+LOCAL_MANIFEST_FILE := main/AndroidManifest.xml
 LOCAL_MODULE := setup-wizard-lib
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/main/res
+LOCAL_SRC_FILES := $(call all-java-files-under, main/src)
 
 include $(BUILD_STATIC_JAVA_LIBRARY)

library/build.gradle

@@ -7,10 +7,10 @@ android {
 
     sourceSets {
         main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            res.srcDirs = ['res']
+            manifest.srcFile 'main/AndroidManifest.xml'
+            java.srcDirs = ['main/src']
+            resources.srcDirs = ['main/src']
+            res.srcDirs = ['main/res']
         }
 
         productFlavors {
@@ -29,7 +29,7 @@ android {
         }
 
         icsCompat {
-            res.srcDirs = ['res-ics']
+            res.srcDirs = ['ics/res']
         }
 
         androidTest {

library/common.mk

@@ -12,6 +12,6 @@
 #   include frameworks/opt/setupwizard/library/common.mk
 #
 
-LOCAL_RESOURCE_DIR += $(call my-dir)/res
+LOCAL_RESOURCE_DIR += $(call my-dir)/main/res
 LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.setupwizardlib
 LOCAL_STATIC_JAVA_LIBRARIES += setup-wizard-lib