Bug 1509573 - Part 0: Only compile Java via Gradle in export tier. r=chmanchester.mielczarek
authorNick Alexander <nalexander@mozilla.com>
Tue, 18 Dec 2018 23:25:55 +0000
changeset 451212 6ba198e2a59e3e4ccfc5adf3638843a004c75f7d
parent 451211 7c5b9046b433942d9a700e985113c0f8a478c637
child 451213 43ddf4c3ae27c4b721151545033e79775894636e
push id35229
push userbtara@mozilla.com
push dateWed, 19 Dec 2018 04:52:04 +0000
treeherdermozilla-central@be5e54edad60 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester.mielczarek
bugs1509573
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1509573 - Part 0: Only compile Java via Gradle in export tier. r=chmanchester.mielczarek This was always an accident of history: we forced export tier without avoiding it in the libs tier. Differential Revision: https://phabricator.services.mozilla.com/D14893
mobile/android/base/Makefile.in
python/mozbuild/mozbuild/frontend/data.py
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -56,10 +56,8 @@ gradle-omnijar: $(abspath $(DIST)/fennec
 else
 # In automation, omni.ja is built only during packaging.
 gradle-omnijar:
 
 gradle-targets:
 endif
 
 .PHONY: gradle-targets gradle-omnijar
-
-export:: android_apks
--- a/python/mozbuild/mozbuild/frontend/data.py
+++ b/python/mozbuild/mozbuild/frontend/data.py
@@ -1168,16 +1168,17 @@ class GeneratedFile(ContextDerived):
         suffixes = (
             '.c',
             '.cpp',
             '.h',
             '.inc',
             '.py',
             '.rs',
             'node.stub', # To avoid VPATH issues with installing node files: https://bugzilla.mozilla.org/show_bug.cgi?id=1461714#c55
+            'android_apks', # We need to compile Java to generate JNI wrappers for native code compilation to consume.
         )
         self.required_for_compile = [f for f in self.outputs if f.endswith(suffixes) or 'stl_wrappers/' in f]
 
 
 class ChromeManifestEntry(ContextDerived):
     """Represents a chrome.manifest entry."""
 
     __slots__ = (