From e44bb4471c8c70b52313b173c0646458d43d79d2 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Thu, 11 Oct 2012 10:10:49 -0700
Subject: [PATCH] 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                | 6 +++---
 mobile/android/base/Makefile.in                           | 8 ++++----
 .../{android-sync-files.mk => android-services-files.mk}  | 0
 mobile/android/base/strings.xml.in                        | 2 +-
 mobile/android/{sync => services}/README.txt              | 0
 .../{sync => services}/android-drawable-hdpi-resources.mn | 0
 .../{sync => services}/android-drawable-ldpi-resources.mn | 0
 .../{sync => services}/android-drawable-mdpi-resources.mn | 0
 .../{sync => services}/android-drawable-resources.mn      | 0
 .../{sync => services}/android-layout-resources.mn        | 0
 .../{sync => services}/android-values-resources.mn        | 0
 mobile/android/{sync => services}/java-sources.mn         | 0
 .../{sync => services}/java-third-party-sources.mn        | 0
 .../manifests/SyncAndroidManifest_activities.xml.in       | 0
 .../manifests/SyncAndroidManifest_permissions.xml.in      | 0
 .../manifests/SyncAndroidManifest_services.xml.in         | 0
 mobile/android/{sync => services}/preprocess-sources.mn   | 0
 mobile/android/{sync => services}/strings.xml.in          | 0
 18 files changed, 8 insertions(+), 8 deletions(-)
 rename mobile/android/base/{android-sync-files.mk => android-services-files.mk} (100%)
 rename mobile/android/{sync => services}/README.txt (100%)
 rename mobile/android/{sync => services}/android-drawable-hdpi-resources.mn (100%)
 rename mobile/android/{sync => services}/android-drawable-ldpi-resources.mn (100%)
 rename mobile/android/{sync => services}/android-drawable-mdpi-resources.mn (100%)
 rename mobile/android/{sync => services}/android-drawable-resources.mn (100%)
 rename mobile/android/{sync => services}/android-layout-resources.mn (100%)
 rename mobile/android/{sync => services}/android-values-resources.mn (100%)
 rename mobile/android/{sync => services}/java-sources.mn (100%)
 rename mobile/android/{sync => services}/java-third-party-sources.mn (100%)
 rename mobile/android/{sync => services}/manifests/SyncAndroidManifest_activities.xml.in (100%)
 rename mobile/android/{sync => services}/manifests/SyncAndroidManifest_permissions.xml.in (100%)
 rename mobile/android/{sync => services}/manifests/SyncAndroidManifest_services.xml.in (100%)
 rename mobile/android/{sync => services}/preprocess-sources.mn (100%)
 rename mobile/android/{sync => services}/strings.xml.in (100%)

diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index 6311480ae98..a925d6a06b1 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/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"
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 4f46282ae90..68208e435f5 100644
--- a/mobile/android/base/Makefile.in
+++ b/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)
diff --git a/mobile/android/base/android-sync-files.mk b/mobile/android/base/android-services-files.mk
similarity index 100%
rename from mobile/android/base/android-sync-files.mk
rename to mobile/android/base/android-services-files.mk
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index 6a2c62aed43..93f66c5f1a7 100644
--- a/mobile/android/base/strings.xml.in
+++ b/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>
diff --git a/mobile/android/sync/README.txt b/mobile/android/services/README.txt
similarity index 100%
rename from mobile/android/sync/README.txt
rename to mobile/android/services/README.txt
diff --git a/mobile/android/sync/android-drawable-hdpi-resources.mn b/mobile/android/services/android-drawable-hdpi-resources.mn
similarity index 100%
rename from mobile/android/sync/android-drawable-hdpi-resources.mn
rename to mobile/android/services/android-drawable-hdpi-resources.mn
diff --git a/mobile/android/sync/android-drawable-ldpi-resources.mn b/mobile/android/services/android-drawable-ldpi-resources.mn
similarity index 100%
rename from mobile/android/sync/android-drawable-ldpi-resources.mn
rename to mobile/android/services/android-drawable-ldpi-resources.mn
diff --git a/mobile/android/sync/android-drawable-mdpi-resources.mn b/mobile/android/services/android-drawable-mdpi-resources.mn
similarity index 100%
rename from mobile/android/sync/android-drawable-mdpi-resources.mn
rename to mobile/android/services/android-drawable-mdpi-resources.mn
diff --git a/mobile/android/sync/android-drawable-resources.mn b/mobile/android/services/android-drawable-resources.mn
similarity index 100%
rename from mobile/android/sync/android-drawable-resources.mn
rename to mobile/android/services/android-drawable-resources.mn
diff --git a/mobile/android/sync/android-layout-resources.mn b/mobile/android/services/android-layout-resources.mn
similarity index 100%
rename from mobile/android/sync/android-layout-resources.mn
rename to mobile/android/services/android-layout-resources.mn
diff --git a/mobile/android/sync/android-values-resources.mn b/mobile/android/services/android-values-resources.mn
similarity index 100%
rename from mobile/android/sync/android-values-resources.mn
rename to mobile/android/services/android-values-resources.mn
diff --git a/mobile/android/sync/java-sources.mn b/mobile/android/services/java-sources.mn
similarity index 100%
rename from mobile/android/sync/java-sources.mn
rename to mobile/android/services/java-sources.mn
diff --git a/mobile/android/sync/java-third-party-sources.mn b/mobile/android/services/java-third-party-sources.mn
similarity index 100%
rename from mobile/android/sync/java-third-party-sources.mn
rename to mobile/android/services/java-third-party-sources.mn
diff --git a/mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in b/mobile/android/services/manifests/SyncAndroidManifest_activities.xml.in
similarity index 100%
rename from mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in
rename to mobile/android/services/manifests/SyncAndroidManifest_activities.xml.in
diff --git a/mobile/android/sync/manifests/SyncAndroidManifest_permissions.xml.in b/mobile/android/services/manifests/SyncAndroidManifest_permissions.xml.in
similarity index 100%
rename from mobile/android/sync/manifests/SyncAndroidManifest_permissions.xml.in
rename to mobile/android/services/manifests/SyncAndroidManifest_permissions.xml.in
diff --git a/mobile/android/sync/manifests/SyncAndroidManifest_services.xml.in b/mobile/android/services/manifests/SyncAndroidManifest_services.xml.in
similarity index 100%
rename from mobile/android/sync/manifests/SyncAndroidManifest_services.xml.in
rename to mobile/android/services/manifests/SyncAndroidManifest_services.xml.in
diff --git a/mobile/android/sync/preprocess-sources.mn b/mobile/android/services/preprocess-sources.mn
similarity index 100%
rename from mobile/android/sync/preprocess-sources.mn
rename to mobile/android/services/preprocess-sources.mn
diff --git a/mobile/android/sync/strings.xml.in b/mobile/android/services/strings.xml.in
similarity index 100%
rename from mobile/android/sync/strings.xml.in
rename to mobile/android/services/strings.xml.in