Bug 798043 - Move 'sync' to 'services' as a precursor to landing product announcements. r=blassey

--HG--
rename : mobile/android/base/android-sync-files.mk => mobile/android/base/android-services-files.mk
rename : mobile/android/sync/README.txt => mobile/android/services/README.txt
rename : mobile/android/sync/android-drawable-hdpi-resources.mn => mobile/android/services/android-drawable-hdpi-resources.mn
rename : mobile/android/sync/android-drawable-ldpi-resources.mn => mobile/android/services/android-drawable-ldpi-resources.mn
rename : mobile/android/sync/android-drawable-mdpi-resources.mn => mobile/android/services/android-drawable-mdpi-resources.mn
rename : mobile/android/sync/android-drawable-resources.mn => mobile/android/services/android-drawable-resources.mn
rename : mobile/android/sync/android-layout-resources.mn => mobile/android/services/android-layout-resources.mn
rename : mobile/android/sync/android-values-resources.mn => mobile/android/services/android-values-resources.mn
rename : mobile/android/sync/java-sources.mn => mobile/android/services/java-sources.mn
rename : mobile/android/sync/java-third-party-sources.mn => mobile/android/services/java-third-party-sources.mn
rename : mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in => mobile/android/services/manifests/SyncAndroidManifest_activities.xml.in
rename : mobile/android/sync/manifests/SyncAndroidManifest_permissions.xml.in => mobile/android/services/manifests/SyncAndroidManifest_permissions.xml.in
rename : mobile/android/sync/manifests/SyncAndroidManifest_services.xml.in => mobile/android/services/manifests/SyncAndroidManifest_services.xml.in
rename : mobile/android/sync/preprocess-sources.mn => mobile/android/services/preprocess-sources.mn
rename : mobile/android/sync/strings.xml.in => mobile/android/services/strings.xml.in

mobile/android/base/AndroidManifest.xml.in

@@ -17,7 +17,7 @@
     <uses-sdk android:minSdkVersion="8"
               android:targetSdkVersion="14"/>
 
-#include ../sync/manifests/SyncAndroidManifest_permissions.xml.in
+#include ../services/manifests/SyncAndroidManifest_permissions.xml.in
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -169,7 +169,7 @@
           </intent-filter>
         </activity>
 
-#include ../sync/manifests/SyncAndroidManifest_activities.xml.in
+#include ../services/manifests/SyncAndroidManifest_activities.xml.in
 
 #if MOZ_CRASHREPORTER
   <activity android:name="CrashReporter"
@@ -241,7 +241,7 @@
         </service>
 
 
-#include ../sync/manifests/SyncAndroidManifest_services.xml.in
+#include ../services/manifests/SyncAndroidManifest_services.xml.in
     </application>
 
     <permission android:name="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"

mobile/android/base/Makefile.in

@@ -14,7 +14,7 @@ DIRS = locales
 
 DIST_FILES = package-name.txt
 
-include $(topsrcdir)/mobile/android/base/android-sync-files.mk
+include $(topsrcdir)/mobile/android/base/android-services-files.mk
 
 MOZGLUE_JAVA_FILES := \
   mozglue/DirectBufferAllocator.java \
@@ -284,7 +284,7 @@ GARBAGE += \
   Manifest.java \
   $(NULL)
 
-GARBAGE_DIRS += classes db jars res sync
+GARBAGE_DIRS += classes db jars res sync services
 
 MOZ_ANDROID_SHARED_ID = "$(ANDROID_PACKAGE_NAME).sharedID"
 MOZ_ANDROID_SHARED_ACCOUNT_TYPE = "$(ANDROID_PACKAGE_NAME)_sync"
@@ -1061,7 +1061,7 @@ $(PP_RES_XML): $(patsubst res/%,$(srcdir)/resources/%.in,$(PP_RES_XML))
              $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $(subst res,$(srcdir)/resources,$@).in > $@
 
 # AndroidManifest.xml includes these files, so they need to be marked as dependencies.
-SYNC_MANIFEST_FRAGMENTS = $(wildcard $(topsrcdir)/mobile/android/sync/manifests/*.in)
+SERVICES_MANIFEST_FRAGMENTS = $(wildcard $(topsrcdir)/mobile/android/services/manifests/*.in)
 
 android-tgts = \
   AndroidManifest.xml \
@@ -1073,7 +1073,7 @@ android-tgts = \
 android-preqs = \
   Makefile.in \
   $(call mkdir_deps,db,sync/repositories/android) \
-  $(SYNC_MANIFEST_FRAGMENTS) \
+  $(SERVICES_MANIFEST_FRAGMENTS) \
   WebAppManifestFragment.xml.in \
   WebAppsFragments.java \
   $(NULL)

mobile/android/base/strings.xml.in

@@ -12,7 +12,7 @@
 #includesubst @BOOKMARKSPATH@
 <resources>
   <string name="moz_app_displayname">@MOZ_APP_DISPLAYNAME@</string>
-#include ../sync/strings.xml.in
+#include ../services/strings.xml.in
   <string name="splash_settingup">&splash_settingup;</string>
   <string name="splash_bookmarks_history">&splash_bookmarks_history;</string>
   <string name="no_space_to_start_error">&no_space_to_start_error;</string>