Fix merge.

mozilla-services · Oct 12, 2013 · 74284df · 74284df
1 parent b142546
commit 74284df
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 12 deletions.
diff --git a/fennec-copy-code.sh b/fennec-copy-code.sh
@@ -180,7 +180,7 @@ SYNC_RES_VALUES="res/values/sync_styles.xml"
 SYNC_RES_VALUES_V11="res/values-v11/sync_styles.xml"
 SYNC_RES_VALUES_LARGE_V11="res/values-large-v11/sync_styles.xml"
 # XML resources that do not need to be preprocessed.
-SYNC_RES_XML="res/xml/sync_authenticator.xml res/xml/sync_syncadapter.xml res/xml/sync_options.xml"
+SYNC_RES_XML=$(find res/xml -name '*.xml' | $SORT_CMD)
 
 dump_mkfile_variable "SYNC_PP_JAVA_FILES" "$PREPROCESS_FILES"
 dump_mkfile_variable "SYNC_JAVA_FILES" "$SOURCEFILES"

diff --git a/preprocess.py b/preprocess.py
@@ -107,11 +107,6 @@ def main():
         ]
 
     dot_templates = {
-        "fxaccount_authenticator.xml.template": "res/xml/fxaccount_authenticator.xml",
-        "fxaccount_bookmarks_syncadapter.xml.template": "res/xml/fxaccount_bookmarks_syncadapter.xml",
-        "fxaccount_history_syncadapter.xml.template":   "res/xml/fxaccount_history_syncadapter.xml",
-        "fxaccount_passwords_syncadapter.xml.template": "res/xml/fxaccount_passwords_syncadapter.xml",
-        "fxaccount_tabs_syncadapter.xml.template":      "res/xml/fxaccount_tabs_syncadapter.xml",
         "strings/strings.xml.template":    "res/values/strings.xml",
         }
 

diff --git a/res/xml/fxaccount_authenticator.xml b/res/xml/fxaccount_authenticator.xml
@@ -1,6 +1,4 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
-
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

diff --git a/res/xml/fxaccount_bookmarks_syncadapter.xml b/res/xml/fxaccount_bookmarks_syncadapter.xml
@@ -1,4 +1,3 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/res/xml/fxaccount_history_syncadapter.xml b/res/xml/fxaccount_history_syncadapter.xml
@@ -1,4 +1,3 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/res/xml/fxaccount_passwords_syncadapter.xml b/res/xml/fxaccount_passwords_syncadapter.xml
@@ -1,4 +1,3 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/res/xml/fxaccount_tabs_syncadapter.xml b/res/xml/fxaccount_tabs_syncadapter.xml
@@ -1,4 +1,3 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this