Commit Graph

29 Commits

Author SHA1 Message Date
Kilik Kuo
b5261ea942 Bug 1365505 - [P2][Fennec] Only include exoplayer & HLSDecoder related components when building --with-gradle. r=maliu
MozReview-Commit-ID: 7Y0bZynN66i

--HG--
extra : rebase_source : 6730f4e09c559074387b3fcf9dd2fb038628d448
2017-11-30 17:53:00 +08:00
James Cheng
c1c5121e36 Bug 1419677 - Fix typo to make BuildConfig.DEBUG_BUILD work properly. r=nalexander
MozReview-Commit-ID: ITszwTqsSqk

--HG--
extra : rebase_source : 7ba31f01cabb962a8e97c75ef2f02e2684d90ac0
2017-11-23 11:12:38 +08:00
Nick Alexander
0d056acc9a Bug 1415778 - Part 3: Fix up Gradle. r=jchen
This patch makes the :geckoview Gradle project only use
o.m.geckoview.BuildConfig, and makes the :app Gradle project use all
of the preprocessed code coming from the moz.build system.
Eventually, we'll reduce that set of preprocessed code to only
o.m.gecko.BuildConfig, which will then be produced by Gradle.

MozReview-Commit-ID: Dnkde7axyZL

--HG--
extra : rebase_source : dc0b7f9fa542cbfd9c665bfac761d45f5957f7b8
2017-11-09 09:44:40 -08:00
Nick Alexander
4d8546e06b Bug 1415778 - Part 2: Move AppConstants to o.m.geckoview.BuildConfig. r=jchen
Some of these make no sense for GeckoView, but perfect is the enemy of
the good here.

MozReview-Commit-ID: 9MwRkc61v9P

--HG--
extra : rebase_source : 8e7fa8102c615f34dbd76394fb6877188007c3c7
2017-11-08 21:14:44 -08: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
a090e4b296 Bug 1411688 - Part 0: Make --with-gradle handle single-locale repack ABIs. r=snorp
This agrees with
http://searchfox.org/mozilla-central/rev/423b2522c48e1d654e30ffc337164d677f934ec3/mobile/android/base/generate_build_config.py#95.
It should really come from the underlying binaries for repacks, but
right now we only repack ARM builds, so this will do.

MozReview-Commit-ID: 3UvrJDV1l9a

--HG--
extra : rebase_source : e57b49e32c80906bdb513850c370d64e5a140978
2017-11-02 09:38:47 -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
e5ebccdd4f Bug 1411688 - Part 0: Make --with-gradle handle single-locale repack ABIs. r=snorp
This agrees with
http://searchfox.org/mozilla-central/rev/423b2522c48e1d654e30ffc337164d677f934ec3/mobile/android/base/generate_build_config.py#95.
It should really come from the underlying binaries for repacks, but
right now we only repack ARM builds, so this will do.

MozReview-Commit-ID: 3UvrJDV1l9a

--HG--
extra : rebase_source : 64afca521be49b0bfb4c4a677be24886c0e7f412
2017-11-02 09:38:47 -07:00
Nick Alexander
c1a631a475 Bug 1413332 - Make geckoview's BuildConfig under --with-gradle include computed values. r=maliu,snorp
There's already a secret dependency where
mobile/android/base/Makefile.in (and generated AppConstants.java)
depends on $topobjdir/buildid.h, so this shouldn't be much worse than
what we have.

MozReview-Commit-ID: 2hkAGE9uT10

--HG--
extra : rebase_source : 090b7a5f2063a4e0cc20252703e6575e6716448a
2017-10-31 14:29:39 -07:00
Sebastian Hengst
026ae1698b merge mozilla-inbound to mozilla-central. r=merge a=merge
MozReview-Commit-ID: IMyEmT3cofM
2017-10-22 23:50:42 +02:00
James Willcox
a156aa7132 Bug 1405124 - Set appropriate version code and string for GeckoView AAR r=nalexander
MozReview-Commit-ID: DZAxlp7zBHv
2017-10-21 13:18:16 -05:00
Jan Henning
3fe1971e3f Bug 1403653 - Part 1 - Refactor getDominantColor. r=nechen
We want to use the Palette library for getting a fallback accent colour for lightweight themes, however because of bug 1318667, we might have to continue using our own implementation of getDominantColor on x86 devices.

Therefore we move this into BitmapUtils, so we can have a central location from which to switch between our own and the Palette library implementation.

MozReview-Commit-ID: 52WsfZbW12x

--HG--
extra : rebase_source : b0eb60c25355d1a13418844b5684e4356225e8c3
2017-10-14 19:23:03 +02:00
Sebastian Hengst
b8673b6c5b Backed out changeset e40240828163 (bug 1403653) 2017-10-22 11:54:19 +02:00
Jan Henning
45de111d36 Bug 1403653 - Part 1 - Refactor getDominantColor. r=nechen
We want to use the Palette library for getting a fallback accent colour for lightweight themes, however because of bug 1318667, we might have to continue using our own implementation of getDominantColor on x86 devices.

Therefore we move this into BitmapUtils, so we can have a central location from which to switch between our own and the Palette library implementation.

MozReview-Commit-ID: 52WsfZbW12x

--HG--
extra : rebase_source : b7e66c027ef6c4a6aa01fcda6d17b6afb2e854a9
2017-10-14 19:23:03 +02:00
maliu
fc210a7334 Bug 1384312 - Support generating JNI wrappers under --with-gradle, r=nalexander
MozReview-Commit-ID: HECL60Ggeqn

--HG--
extra : rebase_source : 6b50e42602329db7f0fa5c4b3e89d2e44debaf33
extra : source : 9a3c4f7cd85e1007ed60708fe9c7b1cfff2afa23
2017-10-11 15:37:40 -07:00
Jan Henning
bf6a3ea142 Bug 1385695 - Propagate "app" debug/release build type to dependencies. r=sebastian
Even when building the "app" module in debug mode, by default Gradle still chooses to build all dependencies in release mode, which means that all of our own source files that reside in such a library (geckoview, respectively thirdparty) will e.g. be missing debug info for local variables.

MozReview-Commit-ID: owZr9yKtYI

--HG--
extra : rebase_source : ae09795ebe70bf4213cd3d145efa355712c702a0
2017-07-30 13:55:11 +02:00
Kilik Kuo
787559c44e Bug 1387207 - Exclude code of GeckoHLS-related components if ExoPlayer source code is not included. r=nalexander
MozReview-Commit-ID: CfIrjDzmCjM

--HG--
extra : rebase_source : ad1ca345da1c0636e9304645766055ba4fe9ff1b
2017-08-04 14:11:43 +08:00
Nick Alexander
7c0822f53f Bug 1255227 - Part 1: Stop using deprecated android-sdk-manager Gradle plugin. r=sebastian
This was only ever used to automatically fetch Android SDK
dependencies in the android-gradle-dependencies job in Task Cluster.
That function is now provided by newer Android-Gradle build plugins.

MozReview-Commit-ID: Adrxm2rAPlZ

--HG--
extra : rebase_source : 6cccb53e2ebc2642ee6c61ef13fcb6d8321b67cf
2017-07-18 09:46:09 -07:00
Jim Chen
963412d5e3 Bug 1381924 - Include WebRTC bits for GeckoView; r=nalexander
Include necessary WebRTC files and permissions for GeckoView. For
permissions, we need to add the RECORD_AUDIO permission to GeckoView's
AndroidManifest.xml, but since the file is not preprocessed, we can't
use an `#ifdef MOZ_WEBRTC` block, so I think we'll just have to
unconditionally include the permission.

MozReview-Commit-ID: IUd8FFMsW99

--HG--
extra : rebase_source : b75462d53e6bd05b324e8551c888853c8678ec6b
2017-07-20 18:24:12 -04:00
Nick Alexander
bd230aea82 Bug 1352602 - Part 2: Use build system SDK versions in Gradle configurations. r=maliu
This patch does two things:

- add a Gradle-only ANDROID_COMPILE_SDK_VERSION substitution;
- uses it while uniformizing all of the Gradle Android SDK version
  configurations.

The approach is fairly standard (and we were using it already); see,
for example
https://medium.com/@ali.muzaffar/gradle-configure-variables-for-all-android-project-modules-in-one-place-5a6e56cd384e

This will make bumping the Gradle configuration versions forward
easier.

MozReview-Commit-ID: 1j5siCvR5qt

--HG--
extra : rebase_source : 07afb00de0e4a72af4026eb19ff4f2530c119336
2017-06-21 10:52:30 -07:00
Kilik Kuo
d4ec7b3ded Bug 1341990 - Part 3: Include ExoPlayer in Firefox for Android builds. r=nalexander
MozReview-Commit-ID: 7fTQO9PD365

--HG--
extra : rebase_source : 395ce4decaadb7f0b27409caa3e017327bcff221
2017-05-19 10:49:44 -07:00
Ryan VanderMeulen
5b4a855506 Backed out 4 changesets (bug 1341990) for Android bustage on a CLOSED TREE.
Backed out changeset 5b79baafde67 (bug 1341990)
Backed out changeset d615a9663923 (bug 1341990)
Backed out changeset 4bac6c0c03df (bug 1341990)
Backed out changeset 9b0805d8354b (bug 1341990)
2017-05-23 10:00:28 -04:00
Kilik Kuo
0fd71add1d Bug 1341990 - Part 3: Include ExoPlayer in Firefox for Android builds. r=nalexander
MozReview-Commit-ID: 7fTQO9PD365

--HG--
extra : rebase_source : 45d31bd06b3c6d5280df90d9793c7915b796fd42
2017-05-19 10:49:44 -07:00
cnevinc
e272eb73ae Bug 1351585 - Part 2. Add build flag and change our existing build system to inject leanplum implementation r=nalexander
MozReview-Commit-ID: uN7imeGYcj

--HG--
extra : rebase_source : 215b3c9b2df20d2fbc5f8679568509c3cc430a48
2017-05-13 14:08:57 -07:00
Nick Alexander
f0ae8d607b Bug 1353055 - Strip 'vars' debugging information when building Fennec --with-gradle. r=ahunt
To observe the difference, use `javap -l`.  For example, for
automationRelease and automationDebug built with `./mach gradle clean
app:assembleAutomationRelease app:assembleAutomationDebug`, I see
locally:

$ javap -l objdir-droid/gradle/build/mobile/android/app/intermediates/classes/automation/release/org/mozilla/gecko/home/activitystream/menu/ActivityStreamContextMenu\$1.class
Compiled from "ActivityStreamContextMenu.java"
class org.mozilla.gecko.home.activitystream.menu.ActivityStreamContextMenu$1 extends org.mozilla.gecko.util.UIAsyncTask$WithoutParams<java.lang.Boolean> {
  final android.view.MenuItem val$bookmarkItem;

  final org.mozilla.gecko.home.activitystream.menu.ActivityStreamContextMenu this$0;

  org.mozilla.gecko.home.activitystream.menu.ActivityStreamContextMenu$1(org.mozilla.gecko.home.activitystream.menu.ActivityStreamContextMenu, android.os.Handler, android.view.MenuItem);
    LineNumberTable:
      line 103: 0

  <snip>
}

$ javap -l objdir-droid/gradle/build/mobile/android/app/intermediates/classes/automation/debug/org/mozilla/gecko/home/activitystream/menu/ActivityStreamContextMenu\$1.class
Compiled from "ActivityStreamContextMenu.java"
class org.mozilla.gecko.home.activitystream.menu.ActivityStreamContextMenu$1 extends org.mozilla.gecko.util.UIAsyncTask$WithoutParams<java.lang.Boolean> {
  final android.view.MenuItem val$bookmarkItem;

  final org.mozilla.gecko.home.activitystream.menu.ActivityStreamContextMenu this$0;

  org.mozilla.gecko.home.activitystream.menu.ActivityStreamContextMenu$1(org.mozilla.gecko.home.activitystream.menu.ActivityStreamContextMenu, android.os.Handler, android.view.MenuItem);
    LineNumberTable:
      line 103: 0
    LocalVariableTable:
      Start  Length  Slot  Name   Signature
          0      16     0  this   Lorg/mozilla/gecko/home/activitystream/menu/ActivityStreamContextMenu$1;
          0      16     1 this$0   Lorg/mozilla/gecko/home/activitystream/menu/ActivityStreamContextMenu;
          0      16     2    x0   Landroid/os/Handler;

  <snip>
}

MozReview-Commit-ID: 3HmiGkHhowQ

--HG--
extra : rebase_source : c84d8d4b8ac813e49db0c61a30c7098ff2eae3f4
2017-04-03 13:41:11 -07:00
Nick Alexander
56fbd14e28 Bug 1291366 - Part 3: Generate o.m.geckoview.BuildConfig using Gradle. r=sebastian
There's still work to be done here to unify these two processes, but
that can be follow-up.  In any case, geckoview.BuildConfig should
change very infrequently, and we're hoping to transition to Gradle
eventually.

MozReview-Commit-ID: D2c6XTYqubj

--HG--
extra : rebase_source : 107febdd97899f29fa493925c70252738fb666b9
2016-11-17 14:22:28 -08:00
Nick Alexander
73d0e38845 Bug 1291372 - Produce Maven repository with GeckoView Javadoc and Sources JARs. r=snorp
We use a Maven repository and the (misleadingly named!) uploadArchives
task because this is the best way to make Android Studio download and
recognize the Javadoc and sources.  With this, it's automatic; with a
single AAR file, it's a nightmare of point-and-click configuration.

This patch does a bunch of Gradle hacking to make -javadoc and
-sources JARs; there's nothing special or particularly likely to break
here.

This patch also adds Proguard declarations to the :geckoview library
project.  That involves moving a good part of the Proguard
configuration into mobile/android/geckoview.  (I also expand upon the
existing configuration.)  This should be only a re-arrangement, and
the resulting file is included in the original, so nothing should be
changed.

MozReview-Commit-ID: BGNW1v92J0k

--HG--
extra : rebase_source : 94633d27e8ae6bafa3d6823996355c22d2e2e6eb
2016-11-07 20:07:30 -08:00
Nick Alexander
b4c52f8bca Bug 1291363 - Add geckoview and geckoview_example Gradle projects. r=jchen,sebastian
We need to bump the Gradle Deps task, which fetches dependencies, to
include new test dependencies; and use freshly uploaded tooltool
archives (manually uploaded) containing the new test dependencies.

MozReview-Commit-ID: 8bNOVQPHlk6

--HG--
extra : rebase_source : 0c80117fb58e43f9c857027941f0a14f03b97f13
2016-10-05 20:23:38 -07:00