Bug 41123: Rename GeckoView's merge_aars step to build_apk. (070bc3fd) · Commits · The Tor Project / Applications / tor-browser-build

projects/geckoview/merge_aars→projects/geckoview/build_apk

+0 −0

File moved.

+5 −3

Original line number	Diff line number	Diff line
		@@ -12,6 +12,8 @@ gpg_keyring:
		- richard.gpg
		container:
		use_container: 1
		disable_network:
		build_apk: 1

		var:
		geckoview_version: 115.12.0esr
		@@ -49,10 +51,10 @@ targets:
		variant: nightly

		steps:
		merge_aars:
		filename: 'geckoview-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
		build_apk:
		filename: 'geckoview-[% c("version") %]-apks-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
		version: '[% c("abbrev") %]'
		merge_aars: '[% INCLUDE merge_aars %]'
		build_apk: '[% INCLUDE build_apk %]'
		input_files:
		- project: container-image
		pkg_type: build

+0 −4

Original line number	Diff line number	Diff line
		@@ -403,10 +403,6 @@ targets:
		abi: arm64-v8a
		cross_prefix: aarch64-linux-android
		android:
		container:
		disable_network:
		# Disable network in the script for merging GeckoView .aar files
		merge_aars: 1
		var:
		android: 1
		platform: android