Commit Graph

18 Commits

Author SHA1 Message Date
Tom Tromey
5538d692d3 Bug 1286877 - do not set c-basic-offset for python-mode; r=gps
This removes the unnecessary setting of c-basic-offset from all
python-mode files.

This was automatically generated using

    perl -pi -e 's/; *c-basic-offset: *[0-9]+//'

... on the affected files.

The bulk of these files are moz.build files but there a few others as
well.

MozReview-Commit-ID: 2pPf3DEiZqx

--HG--
extra : rebase_source : 0a7dcac80b924174a2c429b093791148ea6ac204
2016-07-14 10:16:42 -06:00
Sebastian Kaspari
aaab192fc8 Bug 1274955 - Extract Android dependency versions. r=glandium
MozReview-Commit-ID: FXwWjWIXke4

--HG--
extra : rebase_source : 8532dd6049bc411990547888600d1a394d8fbc14
2016-05-23 13:20:43 +02:00
Chris Manchester
d3e163bb6c Bug 1257958 - Move MOZ_ANDROID_MLS_STUMBLER to Python configure. r=nalexander
MozReview-Commit-ID: IFyL9mirNyt
2016-04-22 13:01:22 -07:00
Chris Manchester
e45d29aa24 Bug 1257958 - Move MOZ_ANDROID_SEARCH_ACTIVITY to Python configure. r=nalexander
MozReview-Commit-ID: blxsCpUK1m
2016-04-22 13:01:22 -07:00
Chris Manchester
1f291036d3 Bug 1257958 - Move MOZ_ANDROID_BEAM to Python configure. r=nalexander
MozReview-Commit-ID: DrJSWZwaC5d
2016-04-22 13:01:21 -07:00
Chris Manchester
ca89af719c Bug 1257958 - Move MOZ_ANDROID_DOWNLOADS_INTEGRATION to Python configure. r=nalexander
MozReview-Commit-ID: Alu8Qbtm4U3
2016-04-22 13:01:21 -07:00
Chris Manchester
303634f7fa Bug 1257958 - Move MOZ_ANDROID_GCM to Python configure. r=nalexander
MozReview-Commit-ID: 90vbYKB8rHJ
2016-04-22 13:01:21 -07:00
Mike Shal
b9c1391091 Bug 1259555 - Remove many PP_TARGETS / INSTALL_TARGETS from mobile/android; r=nalexander
The remaining android PP_TARGETS are for l10n or require support for
passing flags to the preprocessor (bug 1259530).


MozReview-Commit-ID: InnQF3e0DZ1
2016-03-23 15:14:12 -04:00
Nick Alexander
8dcc601b5e Bug 1248160 - Part 2: Inline MOZ_ANDROID_SHARED_FXACCOUNT_TYPE. r=ted.mielczarek
This is per-package, so there's no cross-package definition needed.

MozReview-Commit-ID: 8qy2SGJtCh1

--HG--
extra : rebase_source : 5e3cb1959ac560137487d5d0c12002820212aed7
extra : histedit_source : ac2404805e7afc2776c02414ab464d24d3057063
2016-02-13 10:13:10 -08:00
Nick Alexander
a369f9a410 Bug 1248160 - Part 1: Remove MOZ_ANDROID_SHARED_ACCOUNT_TYPE. r=ted.mielczarek
This is cleaning up after Bug 1220906, which removed Old Sync.

MozReview-Commit-ID: EmP4RTMIZ9

--HG--
extra : rebase_source : d97e09ca50dbd2c214c0618d50b7418378697dde
extra : histedit_source : 5148e7d8f5c8f10c36f1fa319ac04fea28432450
2016-02-13 10:00:58 -08:00
Nick Alexander
dfb9b5b160 Bug 1234629 - Post: Add Gradle support for bouncer. r=me
--HG--
extra : commitid : 6jL7OTORPHp
extra : rebase_source : 19cc23344c425082888863cf7dbd00049ab1e3a1
extra : source : 54a3d0851bc60d26fb4744c605787031070052c8
extra : histedit_source : 842b7f6fafd9ee4ba00805b83d088cd9bf97e5cf
2016-01-26 11:54:00 -08:00
Nick Alexander
98ab42ac64 Bug 1234629 - Part 3: Make bouncer's <intent-filter> set a larger subset of Fennec's <intent-filter> set. r=margaret
--HG--
extra : commitid : 5fizArOKIYO
extra : rebase_source : b3241c4a14850848f025733f9a41b069baca910d
extra : source : f80912ecfa87584394d22e28ed09e68c182d1b35
extra : histedit_source : 7fd02c5b614dfb5f0d7780f2d4701576dade9769
2016-01-27 15:44:29 -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
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
Nick Alexander
e6d86b45b4 Bug 1234629 - Post: Make bouncer APK Java package org.mozilla.gecko, like the main APK. r=me
This small change is a follow-up to Bug 1242213, which did the same
for the main package.  This is a nod to the future and Gradle, which
cleanly splits the internal Java package (org.mozilla.gecko) from the
external Android package (org.mozilla.fennec and friends).

--HG--
extra : commitid : 6yO5ngkvK75
extra : rebase_source : d52161ed67a995e8b73683245443c5df41c5e6db
extra : histedit_source : 125732b8ff1a173cc95b04dde8970e34044ef39c
2016-01-27 15:28:12 -08:00
Nick Alexander
242ce6bb3e Bug 1234629 - Post: Add Gradle support for bouncer. r=me
--HG--
extra : commitid : 6jL7OTORPHp
extra : rebase_source : 8151fcd1768b7bfd0a4386dd68c8910894cae892
extra : histedit_source : 673771296f66c8ec5885fef25999e5e195a1767e
2016-01-26 11:54:00 -08:00
Nick Alexander
10ab42be96 Bug 1234629 - Part 3: Make bouncer's <intent-filter> set a larger subset of Fennec's <intent-filter> set. r=margaret
--HG--
extra : commitid : 5fizArOKIYO
extra : rebase_source : a1b22da0223425828ac34723ab50823b95af8b8d
extra : histedit_source : 08ea130e53c3fb45b44cbd7f2fa950b6433e3757
2016-01-27 15:44:29 -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