Nick Alexander
b5a10ff343
Bug 903528 - Follow-up: Fix build dependencies. a=bustage
...
The issue is that the preprocessed files need to be referenced as
$(CURDIR)/file to have Make handle the dependencies correctly. To
allow this, this patch adds ANDROID_MANIFEST_FILE (defaulting to
AndroidManifest.xml) and uses it in the appropriate places.
2014-02-24 23:18:47 -08:00
Nick Alexander
bacdb74030
Bug 903528 - Follow-up: Fix AndroidEclipse project files. r=me
2014-02-24 21:26:41 -08:00
Nick Alexander
72c39cbba9
Bug 903528 - Post: Add Eclipse project data to moz.build. r=rnewman
2014-02-24 18:24:46 -08:00
Nick Alexander
68115862e2
Bug 903528 - Part 2: Land and build Fennec JUnit 3 tests. r=rnewman
...
--HG--
rename : mobile/android/tests/moz.build => mobile/android/tests/browser/moz.build
2014-02-24 18:24:46 -08:00
Nick Alexander
3878f958ce
Bug 903528 - Part 1: Rename background.apk to background-junit3.apk. r=rnewman
...
This is a cautionary move: when uploaded to infrastructure,
background.apk will not look so bad; but browser.apk is likely to
confuse folks. (These files will be in the same directory as
fennec-*apk, and sort earlier than that file.)
I considered including "tests" in the name, but decided not to make a
long name even longer.
This also renames the Android package. This is purely cosmetic, since
the package has no consumers (infrastructure, mach, etc). But this looks
nicer in IDEs: the generated classes fit into the class hierarchy.
2014-02-24 18:24:45 -08:00
Ryan VanderMeulen
74b0c9951b
Merge inbound to m-c.
2014-02-14 08:54:12 -05:00
Nick Alexander
e96865087e
Bug 853045 - Part 4: Add Android Eclipse projects to moz.build files. r=gps
2014-02-13 22:19:50 -08:00
Nick Alexander
60b25ea8e1
Bug 853045 - Pre: Remove outdated test files. r=me
2014-02-13 22:19:49 -08:00
Richard Newman
ec363e88b5
Bug 958900 - Backoff handling and periodic syncing for FxAccountSyncAdapter. r=nalexander
2014-02-13 19:46:23 -08:00
Michael Comella
77dae81ff0
Bug 961526 - Part 1: Fix SQLiteConstraintException in FHR. r=rnewman,mcomella
2014-02-04 15:10:55 -08:00
Nick Alexander
9a73b1f2eb
No bug: Android Sync test-only warning fixes. r=rnewman DONTBUILD
2014-01-24 16:59:13 -08:00
Richard Newman
7184cc1818
Bug 963336 - Extract SyncConfiguration computation from GlobalSession. r=nalexander
2014-01-23 16:48:53 -08:00
Nick Alexander
8d080742f8
Bug 956844 - Part 1: update Android FxSyncAdapter to use new onepw protocol login flow. r=rnewman
2014-01-16 18:35:08 -08:00
Wesley Johnston
a6d7835949
Bug 957131 - Synced bookmarks appear in guest mode but not in default profile. r=rnewman
2014-01-14 21:45:59 -08:00
Nick Alexander
f6fa542334
Bug 956816 - Implement (de)serializing Android BrowserIDKeyPair instances. r=rnewman
2014-01-07 18:27:45 -08:00
Nick Alexander
e041527001
Bug 918012 - Sync with FxAccount and token server. r=rnewman
2013-12-17 15:13:43 -08:00
Nick Alexander
16a571629c
Merge m-c to elm
2013-12-16 09:13:10 -08:00
Nick Alexander
becdea221a
Bug 949880 - Refactor Android Sync's SyncAdapter for FxAccount use. r=rnewman
...
--HG--
extra : rebase_source : 28937855c499bb621458b15424ac67378e43f9db
2013-12-15 15:53:59 -08:00
Nick Alexander
1ddc9ba089
Merge m-c to elm
...
--HG--
rename : mobile/android/base/resources/drawable-mdpi/crash_reporter.png => mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
rename : mobile/android/base/resources/layout/crash_reporter.xml => mobile/android/base/crashreporter/res/layout/crash_reporter.xml
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
2013-12-12 08:21:15 -08:00
Nick Alexander
ca9d630761
Merge m-c to elm
2013-12-11 14:08:02 -08:00
Nick Alexander
42814c41ba
Bug 934646 - Part 3: Declare Android resource directories relative to $SRCDIR. r=glandium,gps,mfinkle
...
--HG--
rename : mobile/android/base/resources/drawable-mdpi/crash_reporter.png => mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
rename : mobile/android/base/resources/layout/crash_reporter.xml => mobile/android/base/crashreporter/res/layout/crash_reporter.xml
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
extra : rebase_source : f6ec8a38594e70520b10202c735dc019f8c856fd
2013-12-11 21:20:07 -08:00
Nick Alexander
b4ea030306
Merge b-i to elm
...
--HG--
rename : b2g/chrome/content/forms.js => dom/inputmethod/forms.js
2013-11-13 15:16:51 -08:00
Nick Alexander
49eefeba8e
Bug 922147 - Abstract password out of Android Sync auth flow. r=rnewman
2013-11-13 15:11:16 -08:00
Nick Alexander
c281c173b8
Merge m-c to elm
2013-11-04 21:25:12 -08:00
Nick Alexander
823b41509a
Merge m-c to elm
2013-10-26 17:23:11 -07:00
Nick Alexander
b9e7d8a368
Bug 925185 - Part 2: Use add_java_jar and restrict JAVA_JAR_TARGETS to moz.build. r=gps
2013-10-24 15:38:22 -07:00
Nick Alexander
1e61b39f8b
Merge fx-team to elm
2013-10-18 11:39:01 -07:00
Tim Taubert
0917768670
merge m-c to elm
2013-10-17 10:51:26 -07:00
Richard Newman
361e5f5a97
Bug 922694 - Part 3: FHR changes for distribution and locale. r=mcomella
2013-10-16 18:56:27 -07:00
Nick Alexander
8509530063
Bug 900522 - Follow up: Rename sync resources. r=me
2013-10-17 17:42:57 -07:00
Nick Alexander
68a7f48145
Merge m-c to elm
2013-10-11 09:33:44 -07:00
Michael Comella
29baaf56bd
Bug 902560: FakeProfileTestCase deletes testing directory if it exists. r=nalexander
2013-10-10 16:44:22 -07:00
Nick Alexander
bb8d186292
Merge m-c to elm
2013-10-02 10:46:44 -07:00
Nick Alexander
0deef7196a
Bug 903534 - Part 1: Build background-debug.apk. r=glandium
...
--HG--
rename : mobile/android/moz.build => mobile/android/tests/background/junit3/moz.build
rename : mobile/android/moz.build => mobile/android/tests/background/moz.build
rename : mobile/android/moz.build => mobile/android/tests/moz.build
2013-10-01 12:43:30 -07:00
Nick Alexander
fc272ce73f
Bug 799734 - Implement generating BrowserID certificates and assertions. r=rnewman
2013-09-27 14:10:04 -07:00
Nick Alexander
3e5e2ccaae
Bug 903531 - First copy of background JUnit 3 test suite. r=rnewman
...
The background test suite covers all the Android Background
Services, including Sync, Product Announcments, and Firefox Health
Report. It is developed at
https://github.com/mozilla-services/android-sync
2013-09-23 13:01:40 -07:00
Michael Comella
3fb065ddf6
Bug 870925 - Add Submissions provider. r=rnewman
2013-10-31 15:30:11 -07:00
Nick Alexander
6c5fc4e94c
Bug 900522 - Part 2: Use ANDROID_RESFILES in mobile/android/base/moz.build. r=gps
...
This defines ANDROID_RESFILES in mobile/android/base/moz.build but
does not use the default processing from java-build.mk.
* * *
Bug 900522 - Part 1: Make ANDROID_RESFILES a moz.build-only variable. r=gps
2013-10-09 16:19:00 -07:00
Wes Kocher
62c0def927
Backed out 5 changesets (bug 922694) for Android rc3 orange
...
Backed out changeset 51185a26a7b7 (bug 922694)
Backed out changeset 3d0582ab0417 (bug 922694)
Backed out changeset d333b85c805d (bug 922694)
Backed out changeset a78a707ba721 (bug 922694)
Backed out changeset 34e48f8bac52 (bug 922694)
2013-10-15 18:32:31 -07:00
Richard Newman
a665fcae13
Bug 922694 - Part 3: FHR changes for distribution and locale. r=mcomella
2013-10-15 16:53:45 -07:00
Mike Hommey
06d6d3c5cf
Bug 943728 - Replace double quotes with single quotes in Makefiles (or remove them when it makes sense). r=mshal
2013-12-03 06:34:21 +09:00
Carsten "Tomcat" Book
bdc4a5eb02
Backed out changeset a829f4d2584a (bug 934646) Android Nightlies Build Bustage
...
--HG--
rename : mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png => mobile/android/branding/aurora/content/fennec_144x144.png
rename : mobile/android/branding/aurora/res/drawable-mdpi/icon.png => mobile/android/branding/aurora/content/fennec_48x48.png
rename : mobile/android/branding/aurora/res/drawable-hdpi/icon.png => mobile/android/branding/aurora/content/fennec_72x72.png
rename : mobile/android/branding/aurora/res/drawable-xhdpi/icon.png => mobile/android/branding/aurora/content/fennec_96x96.png
rename : mobile/android/branding/beta/res/drawable-xxhdpi/icon.png => mobile/android/branding/beta/content/fennec_144x144.png
rename : mobile/android/branding/beta/res/drawable-mdpi/icon.png => mobile/android/branding/beta/content/fennec_48x48.png
rename : mobile/android/branding/beta/res/drawable-hdpi/icon.png => mobile/android/branding/beta/content/fennec_72x72.png
rename : mobile/android/branding/beta/res/drawable-xhdpi/icon.png => mobile/android/branding/beta/content/fennec_96x96.png
rename : mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png => mobile/android/branding/nightly/content/fennec_144x144.png
rename : mobile/android/branding/nightly/res/drawable-mdpi/icon.png => mobile/android/branding/nightly/content/fennec_48x48.png
rename : mobile/android/branding/nightly/res/drawable-hdpi/icon.png => mobile/android/branding/nightly/content/fennec_72x72.png
rename : mobile/android/branding/nightly/res/drawable-xhdpi/icon.png => mobile/android/branding/nightly/content/fennec_96x96.png
rename : mobile/android/branding/official/res/drawable-xxhdpi/icon.png => mobile/android/branding/official/content/fennec_144x144.png
rename : mobile/android/branding/official/res/drawable-mdpi/icon.png => mobile/android/branding/official/content/fennec_48x48.png
rename : mobile/android/branding/official/res/drawable-hdpi/icon.png => mobile/android/branding/official/content/fennec_72x72.png
rename : mobile/android/branding/official/res/drawable-xhdpi/icon.png => mobile/android/branding/official/content/fennec_96x96.png
rename : mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png => mobile/android/branding/unofficial/content/fennec_144x144.png
rename : mobile/android/branding/unofficial/res/drawable-mdpi/icon.png => mobile/android/branding/unofficial/content/fennec_48x48.png
rename : mobile/android/branding/unofficial/res/drawable-hdpi/icon.png => mobile/android/branding/unofficial/content/fennec_72x72.png
rename : mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png => mobile/android/branding/unofficial/content/fennec_96x96.png
2013-11-20 15:16:00 +01:00
Nick Alexander
ea34b572fc
Bug 934646 - Declare Android resource directories relative to $SRCDIR. r=glandium,gps,mfinkle
...
--HG--
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
2013-11-18 09:31:55 -08:00
Nick Alexander
a9d50bed9c
Bug 922147 - Abstract password out of Android Sync auth flow. r=rnewman
...
--HG--
extra : amend_source : 785ee7294bce83665caa3d79ee2144644fc7b9b5
extra : histedit_source : b4b47d0903d6f94b8bd08b78654b4538d18e220f%2Cf89a9d672b5ac4e13481abfcc0f937182680eddd
2013-11-13 19:36:02 -08:00
Nick Alexander
694c8edb52
Backed out changeset 569d58c88da3 (bug 922147)
2013-11-13 17:03:18 -08:00
