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

76 Коммитов

Автор SHA1 Сообщение Дата
Brindusan Cristian 1f6d297e33 Backed out 5 changesets (bug 1508976, bug 1522581) for android geckoview bustages at /usr/bin/python2.7. CLOSED TREE
Backed out changeset 7a6be593b0be (bug 1522581)
Backed out changeset c47b37ac1775 (bug 1522581)
Backed out changeset 91c31d2a7706 (bug 1508976)
Backed out changeset da57df805c56 (bug 1508976)
Backed out changeset 4e5d97c93515 (bug 1508976)
2019-03-05 22:42:15 +02:00
Nick Alexander 5854b41436 Bug 1508976 - Produce a multi-architecture GeckoView "fat AAR". r=snorp,agi,froydnj
Differential Revision: https://phabricator.services.mozilla.com/D15771

--HG--
extra : moz-landing-system : lando
2019-03-05 17:52:54 +00:00
Agi Sferro 085d28afff Bug 1514374 - Remove workaround for accessibility-test-framework. r=nalexander,geckoview-reviewers,snorp
Looks like accessibility-test-framework was added to maven central so we can
remove this.

Differential Revision: https://phabricator.services.mozilla.com/D20365

--HG--
extra : moz-landing-system : lando
2019-02-20 17:44:23 +00:00
Andrei Lazar 9ddd6f263c Bug 1524529 Update Play Services Cast to 16.0.0 r=VladBaicu
Updated play-services-cast to 16.0.0 in order to benefit from the IPv6 and other features.

Differential Revision: https://phabricator.services.mozilla.com/D18324

--HG--
extra : moz-landing-system : lando
2019-02-04 12:44:13 +00:00
Jan Henning 879d1a037c Bug 1503455 - Part 4: Compile with SDK28. r=nalexander,snorp
android.test.* is no longer part of the main framework, so as per
https://developer.android.com/training/testing/set-up-project,
- we must no longer declare them as a *required* dependency in our manifests
- we must explicitly include a dependency on them in our build config

This will temporarily break running tests depending on android.test.* (i.e.
mainly Robocop) on devices using P or newer until we also start targeting P as
well.

Differential Revision: https://phabricator.services.mozilla.com/D16422

--HG--
extra : moz-landing-system : lando
2019-01-28 18:32:11 +00:00
Agi Sferro 02aa520632 Bug 1521404 - Fix apilint warnings about BuildConfig. r=geckoview-reviewers,snorp
See aa9e8a7a23.

Differential Revision: https://phabricator.services.mozilla.com/D17268

--HG--
extra : moz-landing-system : lando
2019-01-23 14:48:12 +00:00
Agi Sferro cffe966865 Bug 1506658 - Add @Nullable or @NonNull to all APIs. r=snorp,rbarker,geckoview-reviewers
Upgrading apilint to the 0.1.6 release will also ensure that new APIs have
nullability annotations via the GV4 and GV5 lints, see [0].

[0]: b994c7ca9d (diff-2c7de691a2642510f69b9ddf59276d85R569)

Differential Revision: https://phabricator.services.mozilla.com/D14896

--HG--
extra : moz-landing-system : lando
2018-12-20 15:22:45 +00:00
Nick Alexander f509ab73ad Bug 1509573 - Part 3: Use |make -C ... stage-package| rather than special Make target. r=snorp
This splits the two stage-package invocations (which are rather slow)
between Fennec and GeckoView, hopefully speeding local GV development
up a little (in the IDE).

The stage-package invocations depend on |mach build faster|, because
the omnijar contents might need to be updated.

In addition, we feed the packaged libs (and asset libs) through.

Differential Revision: https://phabricator.services.mozilla.com/D12799

--HG--
extra : moz-landing-system : lando
2018-12-18 23:01:16 +00:00
Nick Alexander a8199ab531 Bug 1509573 - Part 1: Use |mach build ...| rather than special Make target. r=snorp
This uses |mach build mobile/android/base/...| rather than a custom
target, reducing Make magic and making it a little easier to reason
about the Gradle build.  This is somewhat rearranging deckchairs, but
the more that gets out of Make and into moz.build, the simpler our
lives become.

The shared `onlyIf` Gradle guard will be used to make it very clear
when certain tasks are being skipped, as we move details about Gecko
binaries to depend on the Gradle task execution graph.

I also took the opportunity to improve the task logging.

Differential Revision: https://phabricator.services.mozilla.com/D12798

--HG--
extra : moz-landing-system : lando
2018-12-18 23:54:08 +00:00
Nick Alexander 47d6187d14 Bug 1498406 - Part 2: Don't check for Android platform in configure. r=froydnj
There's no need -- it will be fetched by Gradle when needed.  The only
wrinkle is that the user might be asked to confirm license agreements,
which could be a hassle (and could cause problems in CI, but there we
install relevant platforms in advance).

Differential Revision: https://phabricator.services.mozilla.com/D14288

--HG--
extra : moz-landing-system : lando
2018-12-18 03:29:16 +00:00
Agi Sferro e75266a619 Bug 1502118 - Enforce GV lints with apilint. r=snorp
This makes it so that apilints lints with "GV" codes are enforced and will fail
the build.

Depends on D13882

Differential Revision: https://phabricator.services.mozilla.com/D13883

--HG--
extra : moz-landing-system : lando
2018-12-17 22:32:11 +00:00
Agi Sferro a7360dc455 Bug 1513395 - Ask gradle to download all dependencies. r=nalexander
This adds a task to each project called `downloadDependencies`. This task will
go through each configuration and resolve every dependency so that the gradle
cache contains a copy of every file needed for building and running tests. This
is intended to be used together with our nexus oss database but it can be used
locally too.

Note: `downloadDependencies` does not download dependencies added a runtime,
e.g. by plugins like apilint, checkstyle, findbugs... so we still need to run
those tasks to collect their dependencies.

Depends on D14516

Differential Revision: https://phabricator.services.mozilla.com/D14622

--HG--
extra : moz-landing-system : lando
2018-12-14 21:37:37 +00:00
Agi Sferro 46d5e9f8a4 Bug 1513395 - Vendor accessibility-test-framework in m-c. r=nalexander,geckoview-reviewers,snorp
This vendors accessibility-test-framework which has recently been remove by
accident from the Google maven repository, this library can be removed once
https://issuetracker.google.com/issues/120951637 is resolved.

Depends on D14514

Differential Revision: https://phabricator.services.mozilla.com/D14516

--HG--
extra : moz-landing-system : lando
2018-12-14 21:34:06 +00:00
Razvan Maries 326dd87a7b Backed out 4 changesets (bug 1509573) for unexpected bustages a=backout.
Backed out changeset ace2d2ada8ef (bug 1509573)
Backed out changeset 059741f95cf4 (bug 1509573)
Backed out changeset 36cf7b9ce095 (bug 1509573)
Backed out changeset d7e0661e34c2 (bug 1509573)

--HG--
extra : amend_source : b2bd61c3d8c9db3686bf0d9773f0b53e69174789
2018-11-30 01:40:06 +02:00
Nick Alexander 017054253f Bug 1509573 - Part 4: Use |make -C ... stage-package| rather than special Make target. r=snorp
This splits the two stage-package invocations (which are rather slow)
between Fennec and GeckoView, hopefully speeding local GV development
up a little (in the IDE).

In addition, we feed the packaged libs (and asset libs) through.

Differential Revision: https://phabricator.services.mozilla.com/D12799

--HG--
extra : moz-landing-system : lando
2018-11-28 19:47:48 +00:00
Nick Alexander db00bffc9d Bug 1509573 - Part 3: Extract shared `onlyIf` Gradle guard. r=snorp
This will be used to make it very clear when certain tasks are being
skipped, as we move details about Gecko binaries to depend on the
Gradle task execution graph.

Differential Revision: https://phabricator.services.mozilla.com/D12798

--HG--
extra : moz-landing-system : lando
2018-11-28 19:46:54 +00:00
Nick Alexander f5cdc551cb Bug 1509573 - Part 2: Use |mach build faster| rather than special Make target. r=snorp
This uses |mach build faster| rather than a custom target, reducing
Make magic and making it easier to reason about the Gradle build.  I
also took the opportunity to improve the task logging.

Differential Revision: https://phabricator.services.mozilla.com/D12797

--HG--
extra : moz-landing-system : lando
2018-11-28 19:46:35 +00:00
Agi Sferro a20e4c23c7 Bug 1458668 - Enforce changelog for GeckoView; r=snorp
This patch integrates with apilint changelog feature to ensure we update the
changelog file every time the api changes.

It also adds a high level overview of the changes in v65.

See also: https://github.com/mozilla-mobile/gradle-apilint#changelog

Differential Revision: https://phabricator.services.mozilla.com/D12550

--HG--
extra : moz-landing-system : lando
2018-11-26 16:27:06 +00:00
Agi Sferro 7c73e99698 Bug 1506267 - Use apilint to track API changes in api.txt. r=snorp,nalexander.
Depends on D12047

Differential Revision: https://phabricator.services.mozilla.com/D11821

--HG--
extra : moz-landing-system : lando
2018-11-19 16:03:43 +00:00
Agi Sferro b707132e54 Bug 1506267 - Add plugins.gradle.com to Nexus. r=nalexander.
Differential Revision: https://phabricator.services.mozilla.com/D12047

--HG--
extra : moz-landing-system : lando
2018-11-19 16:03:33 +00:00
Cosmin Sabou b3241c824a Backed out 3 changesets (bug 1506267) for apilint build bustage. CLOSED TREE
Backed out changeset 7a53f4ea811b (bug 1506267)
Backed out changeset 5d1c5593fdf3 (bug 1506267)
Backed out changeset 32e919db3735 (bug 1506267)
2018-11-17 00:54:14 +02:00
Agi Sferro 4df8cf48ad Bug 1506267 - Use apilint to track API changes in api.txt. r=snorp,nalexander.
Depends on D12047

Differential Revision: https://phabricator.services.mozilla.com/D11821

--HG--
extra : moz-landing-system : lando
2018-11-16 20:27:14 +00:00
Agi Sferro f4ce1f73cf Bug 1506267 - Add plugins.gradle.com to Nexus. r=nalexander.
Differential Revision: https://phabricator.services.mozilla.com/D12047

--HG--
extra : moz-landing-system : lando
2018-11-16 22:21:28 +00:00
Jan Henning 93115a878a Bug 1485439 - Upgrade to Java 8. r=nalexander,jchen
Doing so allow to use try-with-resources on all API levels supported by us, not
just starting from API19.

Unfortunately this step also introduces some additional ambiguities in overload
resolution, which means that one of GeckoResult's "then" overloads needs to be
renamed.

Differential Revision: https://phabricator.services.mozilla.com/D4887

--HG--
extra : rebase_source : 7173395484a9616ce739e9d2ba3aa0b8410be386
extra : source : 66955d05bb86c25b1fcb81d60b38be95018d09ca
2018-08-22 21:15:42 +02:00
Jan Henning 449ca95bae Bug 1485439 - Pre: Upgrade Android Gradle plugin. r=nalexander
While extended Java 8 support, especially on older API levels, was already
introduced in v3.0 and we're currently on 3.1.0, we still take the opportunity
to upgrade to the latest plugin version just to be safe.

--HG--
extra : rebase_source : edf81582552439a139a6a978039f4638e161bf99
extra : source : 1f151d5b8992665c3da17f81e89f6e053473cea8
2018-09-04 22:33:00 +02:00
James Willcox e641866f27 Bug 1480920 - Bump versions for Android test runner packages r=jchen
This also removes the trivial tests for geckoview_example that were
causing problems.

Differential Revision: https://phabricator.services.mozilla.com/D3991

--HG--
extra : moz-landing-system : lando
2018-08-23 13:12:20 +00:00
arthur.iakab dfb7a82313 Backed out changeset d3978309484a (bug 1480920) For Android build bustages CLOSED TREE 2018-08-09 23:59:05 +03:00
James Willcox d91e5fd1af Bug 1480920 - Bump versions for Android test runner packages r=jchen
MozReview-Commit-ID: GlC0qJCVl4V
2018-08-09 15:05:30 -05:00
Tudor-Gabriel Vîjială ae279dbf60 Bug 1473313 - Part 1: Set up geckoview build config for androidTest coverage runs. r=nalexander
This patch adds JaCoCo as a dependency for the geckoview androidTest configurations, as well as
the `mach android archive-geckoview-coverage-artifacts` command, and the `--enable-java-coverage`
mozconfig flag.

MozReview-Commit-ID: 36jNAzK44g3

--HG--
extra : rebase_source : 9edc37913a3929ad045270c601c77791d122e363
2018-07-24 11:44:24 +01:00
Tudor-Gabriel Vîjială 7034598959 Bug 1476165 - Part 2: Update Android Gradle plugin to version 3.1.0. r=nalexander,snorp
MozReview-Commit-ID: LR1OWncvuwt

--HG--
extra : rebase_source : 6de8f8927e801789d559a7c361c7b434ae1f74c4
2018-07-17 13:20:19 +01:00
Andrei Lazar 5101981098 Bug 1463376 - Update to latest Google Play Services version. r=nalexander
Updated google play services version as part of work of the Oreo migration and removed unused libraries from gradle.

MozReview-Commit-ID: BKCWs938k3q

--HG--
extra : rebase_source : 2e9ad83904276607f27974206bd3ad0ba2879279
2018-07-13 15:40:03 +03:00
Petru Lingurar 71b46df0d4 Bug 1385464 - Start using support library v. 26; r=nalexander
This patch also:
Resolves missing resources and api changes
- LeanplumActionBarActivity was removed because Support Library 26 deprecated
ActionBarActivity. Class was already not in use.
- CustomTabsService added two new methods which we need to override.
Tested to make sure that previous functionality was maintained but with the
addition of the two new methods maybe that feature could be improved.
- For checking layout direction we'll use our own new method from ViewUtil
which mimics what the now restricted method from the support library would do.
- Upgraded to use AppCompatResources#getDrawable(..) in place
of the now restricted AppCompatDrawableManager.get().getDrawable(..).

Resolves obscure leaks and crashes after the upgrade
- LoaderManager.destroyLoader(..) was added before the existing call to
LoaderManager.restartLoader(..) to prevent potential Cursor leaks
- Disable website suggestions depending on the address bar inputs when running
in automation to avoid Robocop tests failing (they were entering serially maybe
100 characters in <5 ms which created around that many new Threads,
operation that could cause the Executor to throw a RejectedExecutionException)
At the moment this functionality is not covered by tests anyway and it was the
only fix I could find that would not involve changing the whole implemenation
for address bar suggestions, implementation which in the real world works ok.

MozReview-Commit-ID: 2fX1SBHiSh0

--HG--
extra : amend_source : edb6c5853cdcea5ad50a7cf680f2214fdc176cb2
2018-07-13 17:16:37 +03:00
Jim Chen 652208262f Bug 1457863 - 1. Update kotlin to 1.2.41; r=nalexander
Update the kotlin version used for GeckoView tests to 1.2.41. Also turn
on "warnings-as-errors", which is a compiler option introduced in kotlin
1.2.

MozReview-Commit-ID: 7cL2v4jFJ27

--HG--
extra : rebase_source : daf3c2f3ca24304faa10c399c4ef2bd145395ada
2018-05-02 13:49:57 -04:00
Jim Chen ac76d783ec Bug 1457255 - 3. Turn Java warnings into errors; r=nalexander
Turn Java warnings into errors except for the deprecation and serial
warnings. This is done for all Gradle projects except the thirdparty
project.
2018-05-01 00:22:54 -04:00
Noemi Erli 5b7edf8bba Backed out 4 changesets (bug 1457255) for kotlin warnings/errors are not being parsed by Treeherder a=backout
Backed out changeset 9c42ce50a911 (bug 1457255)
Backed out changeset 524a0f9fb978 (bug 1457255)
Backed out changeset a49833bfd519 (bug 1457255)
Backed out changeset 4eccde5dfbef (bug 1457255)
2018-05-02 01:16:57 +03:00
Jim Chen a1549b47c7 Bug 1457255 - 3. Turn Java warnings into errors; r=nalexander
Turn Java warnings into errors except for the deprecation and serial
warnings. This is done for all Gradle projects except the thirdparty
project.
2018-05-01 00:22:54 -04:00
James Willcox 6e2788b633 Bug 1447734 - Specify Google Play Services library version in Gradle r=nalexander
MozReview-Commit-ID: KXcYJTlG2UC
2018-03-22 14:35:38 -05:00
James Willcox dd28aadd33 Bug 1447729 - Specify Android Support library version in Gradle r=nalexander
MozReview-Commit-ID: 6r8tI1v2SeC
2018-03-22 14:35:37 -05:00
Jim Chen 290fc0830c Bug 1439410 - 1. Enable Kotlin for geckoview tests; r=nalexander
Kotlin has several nice features for writing tests, such as lambdas and
default implementations for interface methods. This patch adds Kotlin
support to the geckoview module build.gradle. We don't want to use
Kotlin in non-test code yet, so the patch ensures that only test code
contains Kotlin files.

MozReview-Commit-ID: FcQiHj20xlB

--HG--
extra : rebase_source : e304d25d09291bc0a3faa29bf36f9d01eadc8524
2018-02-22 18:39:11 -05:00
Nick Alexander edf219ba3b Bug 1411654 - Part 1: Upgrade to Android-Gradle 3.0+ and build-tools;26.0.2. r=maliu
New Android-Gradle plugins pin the build-tools version, and we want to
be consistent between Gradle and moz.build.

MozReview-Commit-ID: ApWS4rHzPuH

--HG--
extra : rebase_source : 22008e9333b15c594ce26c2a52f67396d6e3ab84
extra : source : f918500d9cf5112b70bc8e0a120df435b02252b7
2017-10-26 11:00:36 -07:00
Ryan VanderMeulen ac18fd5152 Backed out 20 changesets (bug 1411654) for incorrect android:debuggable. r=nalexander, a=RyanVM
Backed out changeset cfad693be918 (bug 1411654)
Backed out changeset 55776829a744 (bug 1411654)
Backed out changeset c5bf85d56fed (bug 1411654)
Backed out changeset c270f97bb0da (bug 1411654)
Backed out changeset fde9bf9c14c3 (bug 1411654)
Backed out changeset 01836fd98c63 (bug 1411654)
Backed out changeset 730a70767743 (bug 1411654)
Backed out changeset 690e265c684c (bug 1411654)
Backed out changeset f918500d9cf5 (bug 1411654)
Backed out changeset cec2b8828cc8 (bug 1411654)
Backed out changeset 76085ddd5ac7 (bug 1411654)
Backed out changeset 2b37201606f5 (bug 1411654)
Backed out changeset d0d513d1c379 (bug 1411654)
Backed out changeset e7b0cc801cf1 (bug 1411654)
Backed out changeset 901b304603d9 (bug 1411654)
Backed out changeset 373c9a71d945 (bug 1411654)
Backed out changeset 3dc3beab95f8 (bug 1411654)
Backed out changeset 22a861db1573 (bug 1411654)
Backed out changeset 0850b319efd4 (bug 1411654)
Backed out changeset d276d3deba05 (bug 1411654)

--HG--
rename : mobile/android/app/src/main/res/values-v17/themes.xml => mobile/android/base/resources/values-v17/themes.xml
2018-01-17 15:55:38 -05:00
Nick Alexander 47c107e74f Bug 1411654 - Part 1: Upgrade to Android-Gradle 3.0+ and build-tools;26.0.2. r=maliu
New Android-Gradle plugins pin the build-tools version, and we want to
be consistent between Gradle and moz.build.

MozReview-Commit-ID: ApWS4rHzPuH

--HG--
extra : rebase_source : 38a9781c472d858f3300cbbcbdc6d2311c465713
2017-10-26 11:00:36 -07:00
Dorel Luca ab63c465d9 Backed out 19 changesets (bug 1411654) for Android nightly bustages a=backout
Backed out changeset 649e7aa405ca (bug 1411654)
Backed out changeset c2e51b70519f (bug 1411654)
Backed out changeset a371f3ef4312 (bug 1411654)
Backed out changeset db978e230556 (bug 1411654)
Backed out changeset 56538ed998cf (bug 1411654)
Backed out changeset 6ff0cdf46a3d (bug 1411654)
Backed out changeset 0e493bacc5e3 (bug 1411654)
Backed out changeset 23cbcf427745 (bug 1411654)
Backed out changeset eda74143389f (bug 1411654)
Backed out changeset 359fadf9b3e9 (bug 1411654)
Backed out changeset 5c64eda20f1e (bug 1411654)
Backed out changeset bffb6a5b78d1 (bug 1411654)
Backed out changeset 43787f4089c3 (bug 1411654)
Backed out changeset 9141bbdfd13b (bug 1411654)
Backed out changeset 108674372ef7 (bug 1411654)
Backed out changeset fb15e1f54987 (bug 1411654)
Backed out changeset 264476c77210 (bug 1411654)
Backed out changeset d23f467218da (bug 1411654)
Backed out changeset 78576ff98660 (bug 1411654)

--HG--
rename : mobile/android/app/src/main/res/values-v17/themes.xml => mobile/android/base/resources/values-v17/themes.xml
2018-01-13 15:17:49 +02:00
Nick Alexander e820c8ca18 Bug 1411654 - Part 1: Upgrade to Android-Gradle 3.0+ and build-tools;26.0.2. r=maliu
New Android-Gradle plugins pin the build-tools version, and we want to
be consistent between Gradle and moz.build.

MozReview-Commit-ID: ApWS4rHzPuH

--HG--
extra : rebase_source : 5a5730b4b9ce84af40a7c73c4f1abba017103f02
2017-10-26 11:00:36 -07:00
Csoregi Natalia c79466f107 (bug 1411688) Make --with-gradle handle single-locale repack r=snorp a=reland
--HG--
extra : amend_source : d435c08a762988804bfe23251b8b5f76702eca99
2017-11-06 15:23:47 +02:00
Csoregi Natalia aaa47364af Backed out 5 changesets (bug 1411688) for failing Android single-locale repacks. r=backout a=backout
Backed out changeset 65d5d13b4ea0 (bug 1411688)
Backed out changeset 8ba514bd8ed6 (bug 1411688)
Backed out changeset 866854a996b8 (bug 1411688)
Backed out changeset 34f83aab44e6 (bug 1411688)
Backed out changeset 2e4e139bb5d7 (bug 1411688)
2017-11-06 12:18:50 +02:00
Nick Alexander cc2129e406 Bug 1411688 - Part 1: Make --with-gradle handle single-locale repacks. r=snorp
Single-locale repacks do the following:

Download existing APK; unzip APK; update l10n resources; |mach package| with IS_LANGUAGE_REPACK=1.

This is pretty hard to accommodate, but we can try.  The key issues
here are to recognize when IS_LANGUAGE_REPACK=1 and not ask for l10n
resources (in particular, strings.xml) to be generated.

We do need to include the freshly built classes.dex when repackaging,
because newer Gradle/aapt doesn't preserve the R.java IDs.

MozReview-Commit-ID: 9FvQtmPOUjg

--HG--
extra : rebase_source : b0440ceb318662bf3c08f2139c51dae5775a6b38
2017-10-23 13:24:58 -07:00
Sebastian Hengst 07b805d165 Backed out 5 changesets (bug 1411688) for flake8 linting failure at testing/mozharness/scripts/mobile_l10n.py. r=backout on a CLOSED TREE
Backed out changeset 8ddf3257a8db (bug 1411688)
Backed out changeset c313d76f2aa5 (bug 1411688)
Backed out changeset 3df83a3b7e9c (bug 1411688)
Backed out changeset 133417cefdab (bug 1411688)
Backed out changeset a8fd33d8a2af (bug 1411688)
2017-11-04 00:49:47 +01:00
Nick Alexander 9de930db2b Bug 1411688 - Part 1: Make --with-gradle handle single-locale repacks. r=snorp
Single-locale repacks do the following:

Download existing APK; unzip APK; update l10n resources; |mach package| with IS_LANGUAGE_REPACK=1.

This is pretty hard to accommodate, but we can try.  The key issues
here are to recognize when IS_LANGUAGE_REPACK=1 and not ask for l10n
resources (in particular, strings.xml) to be generated.

We do need to include the freshly built classes.dex when repackaging,
because newer Gradle/aapt doesn't preserve the R.java IDs.

MozReview-Commit-ID: 9FvQtmPOUjg

--HG--
extra : rebase_source : 6a34a8c299138ea39c6703f334c8fd5f49b03237
2017-10-23 13:24:58 -07:00
Nick Alexander d86b10b8e5 Bug 1411667 - Remove Spoon plugin references entirely. r=maliu
Spoon and some Gradle work allowed to run certain JUnit 3 test suites
locally.  At the time, running the various test suites was diffficult.
Fast forward, and it's easier to run these suites, and in general they
are only run in Android Studio.  This will only get better as we move
the background services tests into a separate module (Bug 1229149).

MozReview-Commit-ID: KZTWmkhwi96

--HG--
extra : rebase_source : 5244e81ffe81e8611034fea1edb07681266a7581
2017-10-26 15:49:41 -07:00