Граф коммитов

5612 Коммитов

Автор SHA1 Сообщение Дата
Carsten "Tomcat" Book c2a42c6ad4 merge fx-team to mozilla-central a=merge 2016-02-17 12:07:39 +01:00
Dave Townsend 424899c3cd Bug 1245916: Turn on no-undef in toolkit/mozapps/extensions. r=rhelmer
Mostly just declaring globals that Cu.imports defines but there are some actual
bugs here that have been fixed as well as one test that just never ran because
of a hidden exception.

MozReview-Commit-ID: J6uIpYp8ANx

--HG--
extra : rebase_source : 5c19b92e4242088b6fc7a268f255fe9a795928f6
extra : source : 3e5b6df276a9a20fe7b3655656e62a09bc46aaa9
2016-02-03 22:48:48 -08:00
Mike Shal dfe61e6f93 Bug 1243750 - Install all SDKs into sdk/; r=glandium 2016-01-29 14:52:52 -05:00
Robert Helmer 7560b7fefb Bug 1232222 - expose isSystem flag if add-on is a system add-on r=Mossop
MozReview-Commit-ID: 2SRRJplalUy

--HG--
extra : histedit_source : b25b4066a6868bb8ba55cf9cadc5e62465c55e6d
2016-02-13 17:51:21 -08:00
Nick Alexander 0992fec1c5 Bug 1247470 - Don't try to sign bouncer APK during Android single locale repacks. r=glandium
There's no slick way to determine that we're doing a single local
repack, and it's not worth adding a new flag just for this situation.
So let's not sign the bouncer APK if tests are disabled; since tests
are disabled during single local repack packaging, this should be
sufficient.  This makes the bouncer APK just like the Robocop APK.

MozReview-Commit-ID: AaHUEMhcqMy

--HG--
extra : rebase_source : e386c139613f7bfc83b4e7a28e905a6489171c5a
2016-02-10 15:47:45 -08:00
Nick Alexander bc112329f3 Bug 1119520 - Add opt-in Gradle build mode for mobile/android. r=gps
Opt-in by adding --enable-gradle-mobile-android-builds.

Gradle dependencies (including the Android-Gradle plugin) are assumed
to be present.  Local developers will fetch them from the jcentral
repository.

Android-specific Maven dependencies are shipped as "extras" with the
Android SDK, and should be found automatically by the Android-Gradle
plugin.

MozReview-Commit-ID: 966XgddWgEu

--HG--
extra : rebase_source : 8e8c6156e1d06813c250662e104fd14c621d91ab
extra : source : 306cf0271d3e3a344fcbfd2baf75e0450c288cf1
extra : histedit_source : d17446714236c408699a0953882e84ac3a192380%2Cc21b166af79ef1e00215748820bc2670405ac1dc
2016-02-12 10:06:40 -08:00
Carsten "Tomcat" Book b0531843fe merge mozilla-inbound to mozilla-central a=merge 2016-02-12 15:15:17 +01:00
Carsten "Tomcat" Book 1d1148b2d6 Backed out changeset 306cf0271d3e (bug 1119520) for causing merge conflicts with m-i to m-c merge 2016-02-12 15:14:36 +01:00
Felipe Gomes 7d97e11e35 Bug 1246245 - Webextensions and themes should also block initial e10s rollout. r=Mossop
--HG--
extra : commitid : 26feLTKH1Qa
2016-02-11 18:47:09 -02:00
Nick Alexander e144cf6610 Bug 1119520 - Add opt-in Gradle build mode for mobile/android. r=gps
Opt-in by adding --enable-gradle-mobile-android-builds.

Gradle dependencies (including the Android-Gradle plugin) are assumed
to be present.  Local developers will fetch them from the jcentral
repository.

Android-specific Maven dependencies are shipped as "extras" with the
Android SDK, and should be found automatically by the Android-Gradle
plugin.

MozReview-Commit-ID: 966XgddWgEu

--HG--
extra : rebase_source : ff1cf18a59c7c5633e238090cb6a9abb307ed4fb
2016-02-03 11:18:38 -08:00
Carsten "Tomcat" Book bbe3d019dc merge mozilla-inbound to mozilla-central a=merge 2016-02-11 11:52:01 +01:00
Carsten "Tomcat" Book 79f4a7f103 Backed out changeset 5bf07e98c4ee (bug 1243750) for breaking Linux and OS X Nightly Builds 2016-02-10 16:08:27 +01:00
Carsten "Tomcat" Book b8f6140f54 merge mozilla-inbound to mozilla-central a=merge 2016-02-10 11:47:34 +01:00
R Kent James f67807f655 Bug 1211160 - update lastModifiedTime of distribution addons to properly sync roaming profiles, r=dtownsend 2016-02-10 10:33:37 -08:00
Dave Townsend 2baeb943ca Bug 1244357: Use a shim around the certificate DB to allow the add-ons manager to think that add-ons are signed when they aren't. r=rhelmer
Because the add-ons manager hasn't startup up yet we can replace the certificate
database in xpcshell tests with one that claims add-ons are signed by valid
certificates even when they aren't. This allows us to run tests even in builds
where signing cannot be disabled during for the normal application.

This adds an override for all tests except those that are explicitely testing
signing.

--HG--
extra : commitid : 24s3ni5gVYe
extra : rebase_source : a95571dc3556bb035511eea424ba57e8c7007eba
2016-01-29 16:41:18 -08:00
Dave Townsend 2f6755883b Bug 1244248: Cache the certificate database during startup rather than getting it everytime it is needed. r=rhelmer
--HG--
extra : commitid : 800Lx2U4lRD
2016-02-09 08:36:36 -08:00
Dave Townsend 3c97745a55 Backing out c57d2020f884 for bug 1244357 due to test failures. CLOSED TREE
--HG--
extra : commitid : ARB3HviETo6
extra : amend_source : 6386ba6343ce0b187ee2d317bf455a9163ed0330
2016-02-08 10:18:48 -08:00
Dave Townsend aad445ae43 Bug 1245649: Enable no-nested-ternary. r=mconley
--HG--
extra : commitid : 197imYXFNid
extra : rebase_source : ce71773fbd8f57118ba30ab395524d9200c42162
2016-02-03 21:17:16 -08:00
Dave Townsend 306183747d Bug 1244357: Use a shim around the certificate DB to allow the add-ons manager to think that add-ons are signed when they aren't. r=rhelmer
Because the add-ons manager hasn't startup up yet we can replace the certificate
database in xpcshell tests with one that claims add-ons are signed by valid
certificates even when they aren't. This allows us to run tests even in builds
where signing cannot be disabled during for the normal application.

This adds an override for all tests except those that are explicitely testing
signing.

--HG--
extra : commitid : 9Zd5aH92lAQ
extra : rebase_source : 880d0fff51205dc92df91a61fef8b246d2ea2123
2016-01-29 16:41:18 -08:00
Dave Townsend e3d2c41721 Bug 1236377: Ignore invalid file descriptors when loading an add-ons database written by a different OS. r=rhelmer
nsIFile descriptors use OS specific formats so when trying to read them we have
to catch any failure if the database was written by a different OS. This leaves
the _sourceBundle undefined in only one case which is guaranteed to be during
startup since xpistate.descriptor for the add-on will also be incorrect and so
the full add-on scan will be triggered. That will spot the mismatch and update
the add-on in the database with the correct descriptor.

--HG--
extra : commitid : CNTQu1ESg8Q
extra : rebase_source : faa21ebc1d0b6b91bc81f79072e6d5fb9697bd18
2016-02-02 13:17:10 -08:00
Matthew Noorenberghe 46d841af95 Bug 612168 - Follow-up for test_undouninstall.js trailing whitespace. r=eslint
--HG--
extra : commitid : CZIHzxJbzBx
2016-02-06 18:15:29 -08:00
Andrew Swan a6117744fc Bug 612168 - Handle uninstalls of restartless addons in XPIProvider. r=Mossop
--HG--
extra : commitid : 1C1yU1DSWZJ
2016-02-05 15:06:48 -08:00
Phil Ringnalda e3869be7d0 Merge m-c to f-t 2016-02-05 19:45:14 -08:00
Phil Ringnalda 7f5bfce5de Merge m-i to m-c, a=merge 2016-02-05 18:41:47 -08:00
Tom Schuster 943620b92d Bug 1245141 - Use new Proxy for AddonManager.addonTypes. r=mossop 2016-02-05 19:31:08 +01:00
Nick Alexander 002a20ac3b Bug 1234629 - Part 2: Fail packaging if bouncer APK and main APK have different permissions. r=gps
This isn't sensible for b2gdroid, but that project should never enable
the bouncer APK anyway.

--HG--
extra : commitid : 5KSz5ooYeb1
extra : rebase_source : f30abc9b2553493e2a494497c0eafb22ac866890
extra : source : 50bcadca213183aaa64e39632892b8f00957dcfc
extra : histedit_source : 00085fea29a4289d96dbd08b0b45b4ea6780fd26
2016-01-27 14:34:46 -08:00
Nick Alexander d466d2939f Bug 1234629 - Part 1: Create bouncer APK for OTA distribution installs. r=margaret,gps
This commit produces an "install bouncer" APK which is a "hollow
shell" that looks like the main Fennec APK.  In particular, both APKs have:

* the same Android package name (application id); and
* the same set of <permission>, <uses-permission>, and <uses-feature>
  blocks in their manifests.

The bouncer APK must always have an android:versionCode smaller than
the main Fennec APK; for now, we will just bump that manually
mobile/android/bouncer/moz.build.

--HG--
rename : mobile/android/javaaddons/Makefile.in => mobile/android/bouncer/Makefile.in
rename : mobile/android/app/assets/example_asset.txt => mobile/android/bouncer/assets/example_asset.txt
rename : mobile/android/javaaddons/moz.build => mobile/android/bouncer/moz.build
rename : mobile/android/base/resources/drawable-v21/logo.xml => mobile/android/bouncer/res/drawable-v21/logo.xml
rename : mobile/android/base/resources/drawable/logo.xml => mobile/android/bouncer/res/drawable/logo.xml
extra : commitid : 1XkuX1F0pMb
extra : rebase_source : c49ac53697927b0f3d1ee47bc1e7035c1b465e99
extra : source : aaa420ed66d754ecc17b19f5a12297d24371f1ca
extra : histedit_source : 0e3e2fa225c48ba48df72ff116fd62a7b1ef5ed2
2016-01-27 15:28:31 -08:00
Wes Kocher 0e74ba573b Backed out 2 changesets (bug 1232222) for xpcshell bustage
Backed out changeset 06bc151231a5 (bug 1232222)
Backed out changeset 38ba7c48145e (bug 1232222)

--HG--
extra : commitid : 4HsqRVO9R13
2016-02-05 16:29:00 -08:00
Robert Helmer 9845218d0f Bug 1232222 - Expose isSystem flag if add-on is a system add-on. r=Mossop
--HG--
extra : transplant_source : %11%BA%DA%AE%3D%0B%EE%BF%D2M%C6g%7F%86A%F2%BFh%03%22
2016-01-25 12:35:24 -08:00
Dave Townsend 4c3d60d100 Bug 1244302: Remove the add-ons selection UI.
--HG--
extra : commitid : 1lei0PwZgNi
extra : rebase_source : 380537fc9550e9e89e8fd3baee2bfe4db9f925fd
2016-02-02 09:15:59 -08:00
Mike Shal a3bc66c899 Bug 1243750 - Install all SDKs into sdk/; r=glandium 2016-01-29 14:52:52 -05:00
J. Ryan Stinnett 1e0aa94429 Bug 1245251 - Repair add-on manager for external XUL apps. r=Mossop 2016-02-05 09:56:15 -06:00
Nigel Babu ede1aa8b36 Backed out 10 changesets (bug 1234629, bug 1233882) for bustage on Android rc tests
Backed out changeset 9aa32d9a25df (bug 1234629)
Backed out changeset d73d36c9619b (bug 1234629)
Backed out changeset a7f63b3721cd (bug 1233882)
Backed out changeset c79f4a8c3e86 (bug 1234629)
Backed out changeset 400c030d3c01 (bug 1234629)
Backed out changeset 54a3d0851bc6 (bug 1234629)
Backed out changeset f80912ecfa87 (bug 1234629)
Backed out changeset 50bcadca2131 (bug 1234629)
Backed out changeset aaa420ed66d7 (bug 1234629)
Backed out changeset 7a62e97f07c2 (bug 1234629)

--HG--
rename : mobile/android/app/lint.xml => mobile/android/app/base/lint.xml
rename : mobile/android/app/src/main/resources/robolectric.properties => mobile/android/tests/background/junit4/resources/robolectric.properties
extra : commitid : KJVIqyGBEZg
2016-02-05 15:42:28 +05:30
Dave Townsend c8e4d5fbbc Bug 1245649: Turn on use-isnan, no-unexpected-multiline, no-octal and no-self-compare. r=MattN
--HG--
extra : commitid : oKFzhSyf1r
extra : rebase_source : 0d31d93961cdfb2e5e467e0c7f28edb4ab14a083
2016-02-03 18:21:30 -08:00
Dave Townsend e496a11771 Bug 1245649: Turn on no-extra-semi. r=markh
--HG--
extra : commitid : HReQFPDOA6x
extra : rebase_source : 303a92f511c3c9dd2d26135975d4dc7c85e823b3
2016-02-03 17:27:36 -08:00
Dave Townsend 33281c75f0 Bug 1245649: Turn on linebreak-style. r=Gijs
--HG--
extra : commitid : 7JJb4UFNKj9
extra : rebase_source : 5c30f388ad82d3b73ce7d14c71a48a1f0ed84db7
2016-02-03 17:04:56 -08:00
Dave Townsend 0a6414b898 Bug 1245649: Turn on no-trailing-spaces. r=Gijs
--HG--
extra : commitid : F2OWKTvXUO4
extra : rebase_source : ec68631342e0edc59d77b6bab1cdc975ad175327
2016-02-03 14:22:33 -08:00
Dave Townsend 541b00204a Bug 1245649: Merge browser and toolkit eslint rule settings. r=felipe
--HG--
extra : commitid : DrYPQokQp9O
extra : rebase_source : e0bacf124280ecdbeccfc34dbf66fd80f5a9d296
2016-02-03 13:12:18 -08:00
Nick Alexander aa19a9fc96 Bug 1234629 - Part 2: Fail packaging if bouncer APK and main APK have different permissions. r=gps
This isn't sensible for b2gdroid, but that project should never enable
the bouncer APK anyway.

--HG--
extra : commitid : 5KSz5ooYeb1
extra : rebase_source : 71ea30ce85ba33f58d887d3f90367103f99e0eff
extra : histedit_source : cf91111ebe61f87d64c304206e4ddc409aa26535
2016-01-27 14:34:46 -08:00
Nick Alexander 3814ebb59b Bug 1234629 - Part 1: Create bouncer APK for OTA distribution installs. r=margaret,gps
This commit produces an "install bouncer" APK which is a "hollow
shell" that looks like the main Fennec APK.  In particular, both APKs have:

* the same Android package name (application id); and
* the same set of <permission>, <uses-permission>, and <uses-feature>
  blocks in their manifests.

The bouncer APK must always have an android:versionCode smaller than
the main Fennec APK; for now, we will just bump that manually
mobile/android/bouncer/moz.build.

--HG--
rename : mobile/android/javaaddons/Makefile.in => mobile/android/bouncer/Makefile.in
rename : mobile/android/app/assets/example_asset.txt => mobile/android/bouncer/assets/example_asset.txt
rename : mobile/android/javaaddons/moz.build => mobile/android/bouncer/moz.build
rename : mobile/android/base/resources/drawable-v21/logo.xml => mobile/android/bouncer/res/drawable-v21/logo.xml
rename : mobile/android/base/resources/drawable/logo.xml => mobile/android/bouncer/res/drawable/logo.xml
extra : commitid : 1XkuX1F0pMb
extra : rebase_source : 3154b4569efd4cccb4d5f72ff9bbff60d2744d3b
extra : histedit_source : 5e10ab9825bcf653a5a109c8e502658d52aedd79
2016-01-27 15:28:31 -08:00
Nick Alexander 3884e76c7e Bug 1163082 - Part 1: Add --with-android-distribution-directory. r=gps
This simply packs the assets/ subdirectory of the distribution
directory into the assets/ directory of the Android APK using existing
mechanisms.  It also removes the older method of manually pushing
files into dist/bin/distribution, from where they would be packaged
into the APK under distribution/.

--HG--
extra : commitid : BLgM6ZCm9AY
extra : rebase_source : a0896616f79f5a961476e4d2df9745516c58b44a
extra : source : e228040a044b7ff7363a178da2cb0b8b42724048
extra : histedit_source : 0b8f087bc6d70fa42401f4a2476898139bdf606c
2016-01-27 12:25:04 -08:00
Nick Alexander b266bd6df2 Backed out 2 changesets (bug 1163082) for Robocop rc1 failures.
Backed out changeset baf25be8d491 (bug 1163082)
Backed out changeset e228040a044b (bug 1163082)

--HG--
extra : commitid : FNz3fg58MOy
extra : amend_source : e24ac7d8fd3911a7e12ca71d8bb7e618aa1e78ac
2016-02-03 23:15:00 -08:00
Nick Alexander 609e5edb32 Bug 1163082 - Part 1: Add --with-android-distribution-directory. r=gps
This simply packs the assets/ subdirectory of the distribution
directory into the assets/ directory of the Android APK using existing
mechanisms.  It also removes the older method of manually pushing
files into dist/bin/distribution, from where they would be packaged
into the APK under distribution/.

--HG--
extra : commitid : BLgM6ZCm9AY
extra : rebase_source : 572d1ff35a02505f452fee67130b48c8df4499b5
extra : histedit_source : 0b8f087bc6d70fa42401f4a2476898139bdf606c
2016-01-27 12:25:04 -08:00
Birunthan Mohanathas 88ce1ce184 Bug 1204202 - Remove packaging for now obsolete appcrt140.dll/desktopcrt140.dll on VS2015. r=ehsan 2016-02-02 17:42:04 +02:00
Mike Hommey 1d537257e2 Bug 1247162 - Generate a header defining MOZ_SOURCE_*. r=mshal
The behavior is not entirely idempotent (most notably for
buildconfig.html), but this can be improved later if necessary.
It is idempotent where it matters.

This allows to get rid of config/makefiles/rcs.mk and its uses.
2016-02-12 07:16:14 +09:00
Carsten "Tomcat" Book 72386d7be8 Backed out changeset ec30bdea196a (bug 1231784) for ESlint failures 2016-02-11 17:00:30 +01:00
Andrew Halberstadt d11034bdfe Bug 1231784 - Fix toolkit/mozapps/extensions/test/browser/browser_select_confirm.js, r=Mossop
MozReview-Commit-ID: Gr0CCQ3iHTl

--HG--
extra : commitid : I5KAY2WgUAA
extra : rebase_source : 0fc11b86ea73ec3726b578a09f3ab632ca7b6532
extra : amend_source : b3ef504494d4f88e0088f06c326c662fcd9dbd8c
extra : source : 653df21ca86195f23cadc2fc180bff0c6831da25
2016-01-22 14:34:55 -05:00
Andrew Halberstadt 009050594f Bug 1231784 - Fix toolkit/mozapps/update/chrome tests, r=rstrong
MozReview-Commit-ID: GdkkHzxrjAh

--HG--
extra : commitid : AmuYYOjXtDr
extra : rebase_source : d493a3a9a811f0feb2f778c594cf49a6c8b2b48e
extra : amend_source : ea6738fac9fa151c5a1bf1a8a0c4b4a3b1670e43
extra : source : 0aac20bc3619019bc7c19a929154c9b3fbc0df46
2016-01-27 11:36:16 -05:00
Dave Townsend c56db4025e Backed out changeset 3e5b6df276a9 from bug 1245916 for causing test failures.
MozReview-Commit-ID: CbsTB3xqGC6
2016-02-15 11:36:23 -08:00
Dave Townsend 70e2c0d753 Bug 1245916: Turn on no-undef in toolkit/mozapps/extensions. r=rhelmer
Mostly just declaring globals that Cu.imports defines but there are some actual
bugs here that have been fixed as well as one test that just never ran because
of a hidden exception.

MozReview-Commit-ID: J6uIpYp8ANx

--HG--
extra : rebase_source : 9d33fb313aec69e98ac3027d20a6bfc247f27f63
2016-02-03 22:48:48 -08:00