Commit Graph

8743 Commits

Author SHA1 Message Date
Michael Comella
a302af9ad4 Bug 957894: Update account pickling code for Firefox Accounts. r=nalexander 2014-03-26 11:31:43 -07:00
Wes Johnston
ae8af9ce67 Bug 896109 - Don't log null dir requests in GeckoProfile.java. r=mfinkle 2014-03-26 10:47:15 -07:00
Wes Johnston
6cb8447326 Bug 942270 - Fix gingerbread issues with quickshare. r=bnicholson 2014-03-26 10:18:02 -07:00
Wes Johnston
698b5bc3f4 Bug 942270 - Use tabs for prompts with multiple contexts. r=bnicholson,margaret 2014-03-26 10:18:02 -07:00
Wes Johnston
f004248966 Bug 942270 - Gingerbread compatibility of GeckoActionView. r=margaret 2014-03-26 10:18:02 -07:00
Wes Johnston
83aa1d4341 Bug 942270 - Fix tests for quickshare. r=gbrown 2014-03-26 10:18:01 -07:00
Wes Johnston
49f6be314f Bug 942270 - Support quickshare in context menus. r=bnicholson 2014-03-26 10:18:01 -07:00
Wes Johnston
bef2c90b3f Bug 985875 - Set selected item in adapter for single select lists. r=bnicholson 2014-03-25 22:44:08 -07:00
Wes Johnston
7332c1b9f8 Bug 956716 - Use exclusive bounds for substring. r=bnicholson 2014-03-25 22:43:12 -07:00
Wes Kocher
f1802a1e54 Merge m-c to fx-team 2014-03-25 20:23:20 -07:00
Wes Kocher
aee750fb50 Merge fx-team to m-c 2014-03-25 20:03:13 -07:00
Jim Chen
8a4fcc5c66 Bug 987284 - Make "copy JNI files" message easier to read. r=mshal 2014-03-25 14:40:36 -04:00
Lucas Rocha
8250b2042a Bug 987963 - Reset isLoaded state in HomeFragment on configuration change (r=margaret) 2014-03-25 13:31:26 -07:00
Wes Johnston
ba28d7b199 backout e777fa3d7fa9 for build failures 2014-03-25 12:58:06 -07:00
Wes Johnston
014441caa8 Bug 956716 - Crop dialog titles to 256 characters. r=bnicholson 2014-03-25 12:45:57 -07:00
Wes Johnston
a37f62c54c Bug 980152 - Resize images for grid views. r=lucasr 2014-03-25 12:44:22 -07:00
Wes Johnston
d3558bbfb3 Bug 980152 - Update code style in some Panel classes. r=lucasr 2014-03-25 12:44:21 -07:00
Myk Melez
0adaf96c52 Bug 982559 - use intent data to start app from legacy shorcut; r=wesj 2014-03-28 11:27:46 -07:00
James Hugman
833cf6fbbf Bug 958709 - enable webapps to kill their tasks; r=mfinkle,mhaigh
--HG--
extra : amend_source : d57e9195baa5eaf3d9847fef0a5b9d78ae8d3af4
2014-03-25 11:12:58 -07:00
Carsten "Tomcat" Book
3e02b4147d Merge mozilla-central to fx-team 2014-03-25 13:43:40 +01:00
Carsten "Tomcat" Book
0f3ab985f1 merge fx-team to mozilla-central 2014-03-25 13:17:42 +01:00
Geoff Brown
db36a42979 Bug 915449 - Get EditText view instead of using Solo.getEditText; r=mcomella 2014-03-24 16:19:54 -06:00
Ryan VanderMeulen
6f72275f13 Merge inbound to m-c. 2014-03-24 16:47:07 -04:00
Margaret Leibovic
94e24bffbc Bug 943262 - Use CharsetMenu.jsm instead of charsetTitles.properties for Character Encoding menu items. r=bnicholson 2014-03-24 09:22:32 -07:00
Ms2ger
10b8ea2f45 Bug 860731 - Part d: Fix packaging; r=janv 2014-03-24 16:11:16 +01:00
Phil Ringnalda
3ecca4f142 Back out 4 changesets (bug 986114) for 50% roboprovider bustage
CLOSED TREE

Backed out changeset cc87c22aab07 (bug 986114)
Backed out changeset c75b0b78ebbf (bug 986114)
Backed out changeset d9e1c755f554 (bug 986114)
Backed out changeset f1d1a28b0f5a (bug 986114)
2014-03-22 21:34:30 -07:00
Phil Ringnalda
4d8ebe6a29 Merge m-c to f-t 2014-03-22 17:48:30 -07:00
Richard Newman
e2d1d8ae66 No bug - move docs from wiki to in-tree Sphinx docs. r=doc-only 2014-03-22 15:47:31 -07:00
Myk Melez
15843caab5 Bug 982557 - migrate old prefs and set apkPackageName after updating app via APK; r=mfinkle 2014-03-22 14:26:43 -07:00
Jim Chen
f0e9202773 Bug 984463 - Update GeckoEditableListener constants to match IMEMessage constants. r=masayuki 2014-03-21 13:44:59 -04:00
Kartikaya Gupta
516b8a3beb Bug 986472 - Ensure that touch points fall inside the element bounds when being moved. r=wesj 2014-03-21 11:45:30 -04:00
Carsten "Tomcat" Book
695b04a65c merge fx-team to mozilla-central 2014-03-21 15:16:06 +01:00
Wes Kocher
568daf3e7f Merge m-c to inbound 2014-03-20 19:46:52 -07:00
Richard Newman
c834764a8e Bug 986096 - On access to Sync through settings after setup, user should be sent to config screen not 'back to browsing'. r=nalexander 2014-03-20 19:14:44 -07:00
Vlad Tanase
3081d469a3 Bug 983475 - Remove shouldShowProgress method from browser.js. r=bnicholson 2014-03-19 16:08:05 +02:00
Marco Castelluccio
2d91585c43 Bug 895638 - Reinstall permissions when the runtime is upgraded. r=wesj 2014-03-24 09:10:56 -04:00
Nick Alexander
52642ff855 Bug 986114 - Follow-up: Fix bustage on a CLOSED TREE. 2014-03-21 16:42:02 -07:00
Richard Newman
d746352c74 Bug 986114 - Part 2: switch TabsProvider to use PerProfileDatabaseProvider. r=nalexander 2014-03-21 16:00:39 -07:00
Richard Newman
13f5db8d6b Bug 986114 - Part 1: ReadingListProvider and BrowserProvider should share DB accessors. r=nalexander 2014-03-21 16:00:38 -07:00
Richard Newman
4a2968280a Bug 986114 - Pre: clean up testReadingListProvider. r=trivial 2014-03-21 16:00:38 -07:00
Richard Newman
5ef5abff1d Bug 986719 - Centralized documentation for UITelemetry. r=gps DONTBUILD 2014-03-21 15:59:57 -07:00
Richard Newman
96f759fee4 Bug 984723 - Rework intervals and scheduling for Android Sync. r=nalexander, Android-only so fine for a CLOSED TREE 2014-03-20 12:11:07 -07:00
Lucas Rocha
800dfa4818 Bug 969043 - Log warning in save()/deleteAll() calls outside of sync window (r=margaret) 2014-03-20 15:31:42 +00:00
Lucas Rocha
944651d17b Bug 972098 - Refresh DynamicPanels when the dataset changes (r=margaret) 2014-03-20 15:28:22 +00:00
Lucas Rocha
588159f252 Bug 972098 - Factor out code to restart a dataset loader (r=margaret) 2014-03-20 15:28:21 +00:00
Lucas Rocha
95934a2547 Bug 974454 - Allow showing only description in panel items (r=margaret) 2014-03-20 15:15:42 +00:00
Eugen Sawin
fc91e01131 Bug 950417 - Enable safe direct request add-on installs. r=wesj, r=Mossop 2014-03-19 21:24:59 +01:00
Carsten "Tomcat" Book
1f5c06c461 merge fx-team to mozilla-central 2014-03-20 14:04:58 +01:00
Michael Comella
48fa25ca32 Bug 985610 - Remove duplicate menu_item_textsize definition. r=wesj 2014-03-19 16:06:19 -07:00
Myk Melez
5dc916c0b3 Bug 985618 - only cancel notification if update check is user-initiated; r=mfinkle 2014-03-19 13:21:48 -07:00
Myk Melez
d7f62d5c51 Bug 985299 - register WebappsUpdateTimer with category manager only if Synthetic APKs enabled; r=mfinkle
--HG--
extra : rebase_source : 036a2f62e0cd89cbc1538f06633b50046282cfd3
2014-03-19 10:13:43 -07:00
Myk Melez
49ab907fc7 Bug 985295 - give WebappsUpdateTimer component a unique contract ID; r=mfinkle
--HG--
extra : rebase_source : a70c296dabe2cbb1ca5ef639a004d12f15c66469
2014-03-19 10:09:35 -07:00
Lucas Rocha
8835423caa Bug 975091 - Use wrap_content height params in PanelArticleItem (r=margaret) 2014-03-25 11:38:55 +00:00
Carsten "Tomcat" Book
075b2961d5 merge fx-team to mozilla-central 2014-03-19 16:21:06 +01:00
Paolo Amadini
4e22767010 Bug 984819 - Remove deprecated promise.js usage in Firefox for Android tests. r=bnicholson 2014-03-19 08:39:35 +01:00
Richard Newman
d79724ffe8 Bug 980187 - Content provider for Fennec profiles. r=nalexander 2014-03-18 19:20:07 -07:00
Richard Newman
e8b4d7494c Backed out changeset 6f60d60ea58d for having the wrong bug number. 2014-03-18 19:21:49 -07:00
Richard Newman
378a9c8711 Bug 984740 - When calling notifyChange, don't request an upload sync if the caller is Sync. r=nalexander 2014-03-18 19:20:07 -07:00
Richard Newman
62ecc43670 Bug 707123 - Part 2: content provider for Fennec profiles. r=nalexander 2014-03-18 19:20:07 -07:00
Margaret Leibovic
99c548c4bc Bug 984873 - Hide banner for the rest of the session after the user has clicked on it. r=bnicholson 2014-03-18 15:39:58 -07:00
Brian Nicholson
8a187d3c3e Bug 962103 - Fix progress bar visibility on pre-Honeycomb devices. r=lucasr
--HG--
extra : rebase_source : ae10c57b04012d3c746fbaaaa2838ea230b32b58
2014-03-18 10:36:23 -07:00
Brian Nicholson
0ea9607fa6 Bug 962103 - Make progress bar overlap content. r=lucasr
--HG--
extra : rebase_source : 81e81fa285f34243a1fbb8489d1d6d9893429159
2014-03-18 10:36:23 -07:00
Margaret Leibovic
8fd6a283c1 Bug 982181 - Hide home banner after it is animated off screen, to avoid intercepting click events on pre-honeycomb devices. r=lucasr 2014-03-18 15:30:20 -07:00
Brad Lassey
01d08bd495 bug 928096 - UI for Tab streaming r=mfinkle 2014-03-18 15:05:46 -04:00
Fernando Jiménez
03ca9f8669 Bug 976002 - Build time flag to enable/disable FxA. r=fabrice, r=gps 2014-03-17 09:58:16 -07:00
Josh Dover
1c206bbb5b Bug 982190 - Add backImageUrl to allow for view-level custom back icons. r=lucasr 2014-03-10 18:45:35 -07:00
Josh Dover
c38c763203 Bug 982172 - Add request type to delay filter stack changes until data loads. r=lucasr 2014-03-14 13:14:10 -07:00
Josh Dover
e3f467c3ee Bug 982172 - Encapsulate DatasetRequest fields. r=lucasr 2014-03-17 09:06:17 -07:00
John Shih
cb5eaaff88 Bug 960426 - Part 3: Related Change in Fennec. r=blassey 2014-03-05 17:42:42 +08:00
Margaret Leibovic
24a5be285f Bug 942281 - Move panel validation into Panel constructor (r=lucasr) 2014-03-03 14:23:06 -08:00
Wes Johnston
e78ad205c0 Bug 942270 - Backout strings that were landed twice. r=backout 2014-03-27 09:17:18 -07:00
Sola Ogunsakin
bc7a03069b Bug 968308 - Part 3: Sessions for each panel. r=liuche 2014-03-26 18:19:17 -07:00
Sola Ogunsakin
16003c66e2 Bug 968308 - Part 2: Session for about:home. r=liuche 2014-03-26 18:19:40 -07:00
Sola Ogunsakin
fb283848fc Bug 968308 - Part 1: Make "reason" optional in stopUISession. r=liuche 2014-03-26 18:19:47 -07:00
Josh Dover
18eafb4763 Bug 975055 - Show up arrow for back row. r=lucasr 2014-02-27 16:42:48 -08:00
Richard Newman
f043e6f045 Bug 975838 - Part 2: JUnit3 test that a GeckoMenu call will fail on the wrong thread. r=wesj 2014-03-17 19:39:40 -07:00
Richard Newman
8a8147efd5 Bug 975838 - Part 1: add methods to log or throw if called on the wrong thread, pepper GeckoMenu with thread affinities. r=wesj 2014-03-17 19:39:40 -07:00
Carsten "Tomcat" Book
8ef4fd4a96 Merge mozilla-central to fx-team 2014-03-19 16:27:57 +01:00
Vlad Tanase
b7f1e3706a Bug 976144 - Changed the show progress bar conditions so that it is no longer shown for about pages. r=bnicholson 2014-03-19 08:47:45 -04:00
Josh Dover
0a887c6bf2 Bug 975055 - Show filter title in back row. r=lucasr 2014-02-24 15:23:29 -08:00
Josh Dover
b3442fc396 Bug 975055 - Show previous filter for back row item. r=lucasr 2014-03-04 15:15:44 -08:00
Josh Dover
db8cc2b92c Bug 975055 - Use ViewState to get previous filter for UI. r=lucasr 2014-03-04 15:14:49 -08:00
Josh Dover
005984e601 Bug 921557 - Use custom EllipsisTextView to handle bug on older devices. r=mleibovic 2014-02-18 15:16:26 -08:00
Richard Newman
8910ccd1db Backed out changeset 1e8fa32e8abd (bug 975838) 2014-03-17 22:42:34 -07:00
Richard Newman
050e04a30d Backed out changeset 02bceb824051 (bug 975838) 2014-03-17 22:42:24 -07:00
Brad Lassey
a0aed99bad bug 979470 - clean up garbage file r=cleanup 2014-03-18 01:30:21 -04:00
Richard Newman
30e60c639b Bug 975838 - Part 2: robocop test that a GeckoMenu call will fail on the wrong thread. r=wesj 2014-03-17 19:39:40 -07:00
Richard Newman
f12a5d53a7 Bug 975838 - Part 1: add methods to log or throw if called on the wrong thread, pepper GeckoMenu with thread affinities. r=wesj 2014-03-17 19:39:40 -07:00
Nick Alexander
ab9b0a7ae2 No bug - Fix warnings. r=trivial
DONTBUILD

--HG--
extra : amend_source : 6805921db1e6afa164b2b3ac066bf08b3ec17a4a
2014-03-17 17:41:57 -07:00
Brad Lassey
dfa7a3294c bug 980197 - on long press of a phone number, select the whole phone number r=mfinkle 2014-03-12 21:16:33 -04:00
Brad Lassey
3b1c716069 bug 979470 - When a phone number is highlighted, offer to call it from the context menu or action bar r=mfinkle 2014-03-11 15:30:40 -04:00
Mozilla Release Engineering
0c196d67b7 Merging in version bump NO BUG CLOSED TREE DONTBUILD 2014-03-17 13:48:08 -07:00
Lucas Rocha
5e11f15214 Bug 983609 - Only update toolbar private mode when a new tab is selected (r=bnicholson) 2014-03-17 13:00:11 +00:00
Wes Johnston
015a059d6a Bug 942270 - Refactor context menu code. r=bnicholson 2014-02-21 14:05:00 -08:00
Kartikaya Gupta
3eec9738d0 Bug 983657 - Update gamepad joystick dead zone to be larger based on user feedback. r=Cwiiis 2014-03-15 17:38:42 -04:00
Wes Johnston
ae8b888a17 Bug 981682 - Don't bother nulling dialog when its closed. r=bnicholson 2014-03-15 14:26:30 -07:00
vivek
2bad21fdcf Bug 959382 - BaseTest.setPreferenceAndWaitForChange helper method. r=mcomella 2014-03-15 17:20:25 -04:00
Richard Newman
14e83db018 Bug 969672 - Handle declined engines on Android. r=nalexander 2014-03-14 19:14:34 -07:00
Mike Hommey
dcf3fafc96 Bug 989147 - Use new sccache for Linux and Android builds. r=gps 2014-03-28 18:41:06 +09:00
Mike Hommey
2334835edb Bug 988774 - Reenable sccache on android builds. r=tbsaunde 2014-03-28 18:41:05 +09:00
Ehsan Akhgari
e3c6df3e5f Bug 983920 - Port window.sidebar and window.external to WebIDL; r=bzbarsky 2014-03-28 00:03:03 -04:00
Wes Kocher
9b1e1a9f9e Merge m-c to inbound 2014-03-27 20:21:50 -07:00
Brad Lassey
24cde10769 Bug 983439 - Ignore mercurial merge conflict files in resources. r=nalexander
DONTBUILD

--HG--
extra : amend_source : 32264340bdabf2c66e71967e1f33158b9a5f5cde
2014-03-14 15:19:57 -07:00
Wes Johnston
17fb1fe464 Bug 942270 - Add strings for context menu quickshare. r=mfinkle 2014-03-14 14:41:22 -07:00
Wes Johnston
b5e7af16fe Bug 942270 - Allow ActionViews in prompts. r=bnicholson 2014-03-14 14:41:20 -07:00
Wes Johnston
708924b691 Bug 942270 - Add intents to PromptListItems. r=bnicholson 2014-03-14 14:41:10 -07:00
Brian Nicholson
afe6eedc96 Bug 983714 - Fix DynamicToolbar VisibilityTransition flags. r=lucasr
--HG--
extra : rebase_source : e318a3d6587716b5a44094d3be03b3d335610495
2014-03-14 10:57:13 -07:00
Wes Kocher
78f4857572 Backed out changeset e7f7cc81c103 (bug 943262) for breaking Android S4 tests 2014-03-14 13:47:43 -07:00
Margaret Leibovic
705e614eab Bug 965622 - String for dynanmic panel empty view text. r=lucasr 2014-03-14 11:49:05 -07:00
Margaret Leibovic
f56889d66c Bug 943262 - Use CharsetMenu.jsm instead of charsetTitles.properties for Character Encoding menu items. r=bnicholson 2014-03-14 11:41:47 -07:00
Margaret Leibovic
e5887739d2 Bug 968640 - Lazy init HomeBanner using ViewStub. r=lucasr
--HG--
rename : mobile/android/base/resources/layout/home_banner.xml => mobile/android/base/resources/layout/home_banner_content.xml
2014-03-14 11:41:46 -07:00
Margaret Leibovic
3edebe70f4 Bug 976232 - Disable home banner in guest mode. r=wesj 2014-03-14 11:41:46 -07:00
David Rajchenbach-Teller
0314b34a32 Bug 961665 - Native implementation of OS.File.read, native bits. r=froydnj, r=bz, r=paolo 2014-03-14 10:13:26 -04:00
Sola Ogunsakin
c922e8a420 Bug 959297 - Get description and approx. reading time for reading list items. r=liuche, r=lucasr, r=margaret, r=rnewman 2014-03-12 14:53:25 -07:00
Carsten "Tomcat" Book
c47ac47f24 merge fx-team to mozilla-central 2014-03-14 12:35:23 +01:00
Nick Alexander
8e367b49bd Bug 974015 - Replace "Firefox online services" with "Firefox cloud services". r=rnewman 2014-03-13 22:31:55 -07:00
Nick Alexander
3e1728664e Bug 974942 - Don't share link{tos,privacy} strings. r=rnewman 2014-03-13 22:31:55 -07:00
Nick Alexander
9384dae95d Bug 974133 - Replace "Firefox account" with "Firefox Account". r=rnewman 2014-03-13 22:31:54 -07:00
Nick Alexander
5312f0d665 Bug 974129 - Part 2: use branding icon instead of fxaccount_icon. r=rnewman 2014-03-13 22:21:00 -07:00
Nick Alexander
c301a24e5a Bug 974129 - Part 1: update fxaccount_intro drawable. r=rnewman 2014-03-13 22:21:00 -07:00
Nick Alexander
23dace10df Bug 974124 - Update padding, margins, and color scheme in FxA setup. r=rnewman 2014-03-13 22:21:00 -07:00
Wes Kocher
fe549fa0e0 Merge m-c to fx-team 2014-03-13 20:01:18 -07:00
Wes Kocher
ecd86b868f Merge fx-team to m-c 2014-03-13 19:09:07 -07:00
Nick Alexander
35d597184e Bug 983350 - Include User-Agent header for FxAccount and TokenServer requests. r=rnewman
--HG--
extra : rebase_source : cb622c61646be2752e4900fd6e480874e9ba5406
2014-03-13 17:13:58 -07:00
Nick Alexander
02e3fa1dd7 Bug 967022 - Fix Gingerbread progressbar animation bustage. r=rnewman
--HG--
extra : rebase_source : 1db653efb3d0656b9208ade6859f86fb10f1be3b
2014-03-13 17:06:29 -07:00
Nick Alexander
d35f07d796 Bug 978944 - Use Android native code pbkdf2sha256 in FxAccounts. r=rnewman,mcomella
--HG--
extra : rebase_source : 73cc0d3b480246f64a07388caafda56465039bda
2014-03-13 17:04:45 -07:00
Wes Kocher
74f2b72f36 Merge m-c to inbound despite the CLOSED TREE 2014-03-13 19:58:47 -07:00
Geoff Brown
7ff7a540b9 Bug 983440 - Disable testInputConnection on Android 2.3 2014-03-13 16:59:01 -06:00
Brian Nicholson
c03462e6c5 Bug 981676 - Fix backout of bugs 980438/962103. r=mfinkle 2014-03-13 14:42:19 -07:00
Brian Nicholson
662299c848 Bug 979166 - Refactor dynamic toolbar code. r=lucasr
--HG--
extra : rebase_source : 665621241d47985699a6994a8aea989ac29f9f7e
2014-03-13 12:29:39 -07:00
Myk Melez
b11310a5bc bug 970300 - singly-stringify JSON message; correct apkPackageName property name; r=mfinkle 2014-03-13 12:01:55 -07:00
Carsten "Tomcat" Book
d34717a818 merge fx-team to mozilla-central 2014-03-13 12:52:51 +01:00
Wes Kocher
029a6912b6 Merge m-c to fx-team 2014-03-12 21:23:37 -07:00
Wes Kocher
4ec0bc82ff Merge fx-team to m-c 2014-03-12 20:01:45 -07:00
Wes Kocher
0a0d0ec03b Merge m-c to m-i 2014-03-12 21:21:07 -07:00
Geoff Brown
9057b2ea02 Bug 966788 - Increase wait time for Gecko:Ready; r=mcomella 2014-03-12 17:44:54 -06:00
Michael Comella
0d66c28321 Bug 959652: Use NativeCrypto.sha1. r=rnewman 2014-03-11 19:43:20 -07:00
Lucas Rocha
6ea7bb6e05 Bug 963817 - Wrap HomeStorage data insertion loop in a transaction (r=margaret) 2014-03-12 17:02:50 +00:00
Richard Newman
c546ece21d Bug 982191 - The resource://services-common/ alias is broken in Fennec. r=nalexander,lucasr 2014-03-12 09:52:50 -07:00
Richard Newman
88ff162ff8 Bug 945429 - Remove log output. r=trivial 2014-03-12 09:49:48 -07:00
Lucas Rocha
d2d33545cc Bug 969055 - Validate items being saved with HomeProvider API (r=margaret) 2014-03-12 16:37:02 +00:00
Chris Kitching
73c812f40f Bug 969417 - Cleanup naming conventions in favicon code. r=rnewman 2014-03-12 16:20:38 +00:00
Chris Kitching
6269828bc6 Bug 969417 - Reduce insanity in favicon cache concurrency. r=rnewman 2014-03-12 16:20:36 +00:00
Margaret Leibovic
ce76f17105 Bug 976232 - Disable home banner in guest mode. r=wesj 2014-03-12 08:57:30 -07:00
Margaret Leibovic
d7432105df Bug 979101 - Enable remote debugger by default on nightly builds. r=mfinkle 2014-03-12 08:57:30 -07:00
Margaret Leibovic
881bad74d7 Bug 976308 - Remove search engine name from initial search suggestions prompt. r=liuche 2014-03-12 08:57:30 -07:00
Margaret Leibovic
e3bd7a344e Bug 982461 - Support launching an intent to the current application package. r=wesj 2014-03-12 08:57:29 -07:00
Nick Alexander
afe2097583 Bug 974627 - Empty contentDescription throughout. r=rnewman 2014-03-10 21:35:32 -07:00
Nick Alexander
58d8245ff4 Bug 979537 - Make geckoview_resources.zip include res/values/strings.xml. r=trivial
The commit looks large, but it's trivial: just replacing $(android_res_files) with $(all_resources) in

+geckoview_resources.zip: $(all_resources) $(GLOBAL_DEPS)

It looks bigger because it needs to move below the definition of $(all_resources).
2014-03-12 17:22:27 -07:00
Nick Alexander
947f8f4ee9 Bug 979388 - Make aapt invocation rebuild R.java. r=glandium
This commit adds an empty recipe to dependencies of .aapt.deps, which
forces the appropriate gecko-R.jar rebuild.  This is because Make treats
targets with no recipe at all differently than targets with an empty
recipe, in a way that defeats our dependencies.

What appeared to be happening is the following:

Touch a resource.  On the next build, .aapt.deps is stale, so aapt is
invoked, which generates R.java, and we touch .aapt.deps.

Now R.java depends on .aapt.deps, but this does not appear to force Make
to consider targets that depend on R.java to be stale.  A target that
depends on R.java (such as gecko-R.jar) itself compares timestamps and
finds that gecko-R.jar is newer than R.java (from the previous build),
and this comparison appears to happen before aapt is invoked.  So even
though .aapt.deps is seen to be stale, and by transitivity R.java is
stale, this does not mark gecko-R.jar as stale.  The timestamp check
between R.java and gecko-R.jar appears to happen *before* aapt is
invoked.

On the second build following the update, the R.java generated in the
previous build is newer than gecko-R.jar, triggering the observed
rebuild of gecko-R.jar.
2014-03-12 17:22:27 -07:00