Bug 1508976 - Post: Include all targets in about:buildconfig in GeckoView fat AAR. r=froydnj
☠☠ backed out by be4b780a7783 ☠ ☠
authorNick Alexander <nalexander@mozilla.com>
Tue, 05 Mar 2019 17:52:36 +0000
changeset 520283 91c31d2a7706c7d32384891f4ad39111bd6d5370
parent 520282 da57df805c568ba2af98d1d62fc3756584e84682
child 520284 c47b37ac17755909e9b1e526bb2ab86f5c5653ab
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1508976
milestone67.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 1508976 - Post: Include all targets in about:buildconfig in GeckoView fat AAR. r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D15773
toolkit/content/moz.build
--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -1,20 +1,27 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
 
-for var in ('target', 'MOZ_CONFIGURE_OPTIONS', 'CC', 'CC_VERSION', 'CXX',
+for var in ('MOZ_CONFIGURE_OPTIONS', 'CC', 'CC_VERSION', 'CXX',
             'RUSTC', 'RUSTC_VERSION'):
     DEFINES[var] = CONFIG[var]
 
+if CONFIG['MOZ_ANDROID_FAT_AAR_TARGETS']:
+    # Turn ["arch1=url1", "arch2=url2"] into "arch1</td><td>arch2".  Yes, this
+    # relies on not sanitizing the interpolated string.
+    DEFINES['target'] = '</td><td>'.join(sorted(arch.split('=')[0] for arch in CONFIG['MOZ_ANDROID_FAT_AAR_TARGETS']))
+else:
+    DEFINES['target'] = CONFIG['target']
+
 DEFINES['CFLAGS'] = ' '.join(CONFIG['OS_CFLAGS'])
 
 rustflags = CONFIG['RUSTFLAGS']
 if not rustflags:
     rustflags = []
 DEFINES['RUSTFLAGS'] = ' '.join(rustflags)
 
 cxx_flags = []