Bug 752873 - Part 2: use Android Sync Makefile include. r=khuey
authorJohn Ford <john@johnford.info>
Wed, 09 May 2012 17:00:54 -0700
changeset 93608 654ac86492e85f15cf2683fecf132259d0b184fd
parent 93607 c7bb680df93bb352016aef3c1f145496eca7e32b
child 93609 6fe7dd2f8f574c9b4e39eaea494d8238b6dc39e2
push id22656
push userjford@mozilla.com
push dateThu, 10 May 2012 00:27:32 +0000
treeherdermozilla-central@654ac86492e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs752873
milestone15.0a1
first release with
nightly linux32
654ac86492e8 / 15.0a1 / 20120510030517 / files
nightly linux64
654ac86492e8 / 15.0a1 / 20120510030517 / files
nightly mac
654ac86492e8 / 15.0a1 / 20120510030517 / files
nightly win32
654ac86492e8 / 15.0a1 / 20120510030517 / files
nightly win64
654ac86492e8 / 15.0a1 / 20120510030517 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 752873 - Part 2: use Android Sync Makefile include. r=khuey
mobile/android/base/Makefile.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -43,25 +43,19 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/ipc/app/defs.mk
 
 DIRS = locales
 
 DIST_FILES = package-name.txt
 
-SYNC_JAVA_FILES=$(shell cat $(topsrcdir)/mobile/android/sync/java-sources.mn | tr '\n' ' ';)
-SYNC_PP_JAVA_FILES=$(shell cat $(topsrcdir)/mobile/android/sync/preprocess-sources.mn | tr '\n' ' ';)
-SYNC_THIRDPARTY_JAVA_FILES=$(shell cat $(topsrcdir)/mobile/android/sync/java-third-party-sources.mn | tr '\n' ' ';)
-SYNC_RES_DRAWABLE=$(shell cat $(topsrcdir)/mobile/android/sync/android-drawable-resources.mn | tr '\n' ' ';)
-SYNC_RES_DRAWABLE_LDPI=$(shell cat $(topsrcdir)/mobile/android/sync/android-drawable-ldpi-resources.mn | tr '\n' ' ';)
-SYNC_RES_DRAWABLE_MDPI=$(shell cat $(topsrcdir)/mobile/android/sync/android-drawable-mdpi-resources.mn | tr '\n' ' ';)
-SYNC_RES_DRAWABLE_HDPI=$(shell cat $(topsrcdir)/mobile/android/sync/android-drawable-hdpi-resources.mn | tr '\n' ' ';)
-SYNC_RES_LAYOUT=$(shell cat $(topsrcdir)/mobile/android/sync/android-layout-resources.mn | tr '\n' ' ';)
-SYNC_RES_VALUES=$(shell cat $(topsrcdir)/mobile/android/sync/android-values-resources.mn | tr '\n' ' ';)
+include $(topsrcdir)/mobile/android/base/android-sync-files.mk
+
+#These SYNC_ variables could be moved to android-sync/fennec-copy-code.sh
 SYNC_RES_XML=res/xml/sync_authenticator.xml
 SYNC_PP_RES_XML=res/xml/sync_syncadapter.xml res/xml/sync_options.xml
 
 FENNEC_JAVA_FILES = \
   AboutHomeContent.java \
   AboutHomeSection.java \
   AlertNotification.java \
   AwesomeBar.java \