Merge branch '3046-apk_per_abi' into 'main' (934a375f) · Commits · e / os / Advanced Privacy

.gitlab-ci.yml

+2 −3

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ build-release-test:
		build-e-release:
		stage: build
		script:
		- ./gradlew :app:assembleEosRelease :app:assembleEosReleaseNoLibs
		- ./gradlew :app:assembleEosRelease
		rules:
		- if: $CI_PIPELINE_SOURCE == "merge_request_event"
		when: never
		@@ -89,6 +89,5 @@ build-e-release:

		artifacts:
		paths:
		- app/build/outputs/apk/eos/releaseNoLibs
		- app/build/intermediates/merged_native_libs/eosRelease/mergeEosReleaseNativeLibs/out/lib
		- app/build/outputs/apk/eos/release
		- app/build/reports

+9 −19

Original line number	Diff line number	Diff line
		@@ -97,6 +97,15 @@ android {
		}
		}

		splits {
		abi {
		enable true
		reset()
		include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
		universalApk false
		}
		}

		buildTypes {
		debug {
		signingConfig null // Set signing config to null as we use signingConfig per variant.
		@@ -110,25 +119,6 @@ android {
		minifyEnabled false
		proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
		}
		releaseNoLibs {
		matchingFallbacks = ["release"]
		manifestPlaceholders = [
		persistent: "true",
		mainActivityIntentFilterCategory: "android.intent.category.INFO"
		]

		minifyEnabled false
		proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
		}
		}

		/**
		* Sets the output name of the variant outputs and also it setup signingConfig based on the product flavor.
		*/
		applicationVariants.all { variant ->
		variant.outputs.all { output ->
		outputFileName = "Advanced_Privacy-${variant.versionName}-${variant.getFlavorName()}-${variant.buildType.name}.apk"
		}
		}

		compileOptions {

+4 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,10 @@ class FakeLocationMapView @JvmOverloads constructor(
		defStyleAttr: Int = 0
		) : MapView(context, attrs, defStyleAttr) {

		init {
		System.loadLibrary("maplibre")
		}

		/**
		* Overrides onTouchEvent because this MapView is part of a scroll view
		* and we want this map view to consume all touch events originating on this view.