diff --git a/patches/fenix-liberate.patch b/patches/fenix-liberate.patch index 7b7b964..36f2d44 100644 --- a/patches/fenix-liberate.patch +++ b/patches/fenix-liberate.patch @@ -1,6 +1,6 @@ -diff -r 0a6479ef0332 mobile/android/android-components/.buildconfig.yml ---- a/mobile/android/android-components/.buildconfig.yml Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/android-components/.buildconfig.yml Tue Nov 19 10:17:20 2024 +0300 +diff -r 8c35adfaf5ea mobile/android/android-components/.buildconfig.yml +--- a/mobile/android/android-components/.buildconfig.yml Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/android-components/.buildconfig.yml Tue Dec 31 18:19:42 2024 +0530 @@ -1566,16 +1566,6 @@ - support-base - support-test @@ -18,14 +18,14 @@ diff -r 0a6479ef0332 mobile/android/android-components/.buildconfig.yml lib-state: description: A library for maintaining application state. path: components/lib/state -diff -r 0a6479ef0332 mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt ---- a/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt Tue Nov 19 10:17:20 2024 +0300 -@@ -92,13 +92,8 @@ +diff -r 8c35adfaf5ea mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt +--- a/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt Tue Dec 31 18:19:42 2024 +0530 +@@ -89,13 +89,8 @@ const val protobuf_plugin = "0.9.4" object Google { const val accompanist = "0.36.0" -- const val firebase_messaging = "24.0.3" +- const val firebase_messaging = "24.1.0" const val material = "1.12.0" const val osslicenses_plugin = "0.10.6" - const val play_review = "2.0.1" @@ -35,7 +35,7 @@ diff -r 0a6479ef0332 mobile/android/android-components/plugins/dependencies/src/ const val protobuf = "4.28.2" // Keep Protobuf in sync with the version used by AppServices. } -@@ -268,14 +263,8 @@ +@@ -272,14 +267,8 @@ const val thirdparty_disklrucache = "com.jakewharton:disklrucache:${Versions.disklrucache}" const val thirdparty_androidsvg = "com.caverock:androidsvg-aar:${Versions.androidsvg}" @@ -50,9 +50,9 @@ diff -r 0a6479ef0332 mobile/android/android-components/plugins/dependencies/src/ const val protobuf_compiler = "com.google.protobuf:protoc:${Versions.Google.protobuf}" const val protobuf_javalite = "com.google.protobuf:protobuf-javalite:${Versions.Google.protobuf}" } -diff -r 0a6479ef0332 mobile/android/fenix/.buildconfig.yml ---- a/mobile/android/fenix/.buildconfig.yml Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/.buildconfig.yml Tue Nov 19 10:17:20 2024 +0300 +diff -r 8c35adfaf5ea mobile/android/fenix/.buildconfig.yml +--- a/mobile/android/fenix/.buildconfig.yml Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/.buildconfig.yml Tue Dec 31 18:19:42 2024 +0530 @@ -63,7 +63,6 @@ - lib-crash-sentry - lib-dataprotect @@ -61,9 +61,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/.buildconfig.yml - lib-state - service-contile - service-digitalassetlinks -diff -r 0a6479ef0332 mobile/android/fenix/app/build.gradle ---- a/mobile/android/fenix/app/build.gradle Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/build.gradle Tue Nov 19 10:17:20 2024 +0300 +diff -r 8c35adfaf5ea mobile/android/fenix/app/build.gradle +--- a/mobile/android/fenix/app/build.gradle Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/build.gradle Tue Dec 31 18:19:42 2024 +0530 @@ -655,7 +655,6 @@ implementation project(':lib-crash') @@ -86,12 +86,12 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/build.gradle - implementation ComponentsDependencies.play_review - implementation ComponentsDependencies.play_review_ktx - - constraints { - implementation (ComponentsDependencies.androidx_tracing) { - because 'AndroidX Test gets force-downgraded to 1.0.0 and breaks otherwise' -diff -r 0a6479ef0332 mobile/android/fenix/app/proguard-rules.pro ---- a/mobile/android/fenix/app/proguard-rules.pro Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/proguard-rules.pro Tue Nov 19 10:17:20 2024 +0300 + androidTestImplementation ComponentsDependencies.testing_fastlane + androidTestImplementation ComponentsDependencies.testing_falcon + +diff -r 8c35adfaf5ea mobile/android/fenix/app/proguard-rules.pro +--- a/mobile/android/fenix/app/proguard-rules.pro Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/proguard-rules.pro Tue Dec 31 18:19:42 2024 +0530 @@ -1,23 +1,6 @@ -dontobfuscate @@ -187,9 +187,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/proguard-rules.pro +-dontwarn org.checkerframework.checker.nullness.qual.EnsuresNonNull +-dontwarn org.checkerframework.checker.nullness.qual.EnsuresNonNullIf +-dontwarn org.checkerframework.checker.nullness.qual.RequiresNonNull -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/AndroidManifest.xml ---- a/mobile/android/fenix/app/src/main/AndroidManifest.xml Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/src/main/AndroidManifest.xml Tue Nov 19 10:17:20 2024 +0300 +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/AndroidManifest.xml +--- a/mobile/android/fenix/app/src/main/AndroidManifest.xml Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/src/main/AndroidManifest.xml Tue Dec 31 18:19:42 2024 +0530 @@ -32,9 +32,6 @@ @@ -200,9 +200,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/AndroidManifest.xml -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjust.java +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjust.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjust.java Tue Nov 19 10:17:20 2024 +0300 ++++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjust.java Tue Dec 31 18:19:42 2024 +0530 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2012-2017 adjust GmbH, @@ -251,9 +251,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjus + public static void gdprForgetMe(final Context context) { + } +} -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustAttribution.java +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustAttribution.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustAttribution.java Tue Nov 19 10:17:20 2024 +0300 ++++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustAttribution.java Tue Dec 31 18:19:42 2024 +0530 @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2012-2017 adjust GmbH, @@ -304,9 +304,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjus + return ""; + } +} -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustConfig.java +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustConfig.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustConfig.java Tue Nov 19 10:17:20 2024 +0300 ++++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustConfig.java Tue Dec 31 18:19:42 2024 +0530 @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2012-2017 adjust GmbH, @@ -357,9 +357,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjus + public void setLogLevel(LogLevel logLevel) { + } +} -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustEvent.java +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustEvent.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustEvent.java Tue Nov 19 10:17:20 2024 +0300 ++++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustEvent.java Tue Dec 31 18:19:42 2024 +0530 @@ -0,0 +1,31 @@ +package com.adjust.sdk; + @@ -392,9 +392,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjus + public void setPurchaseToken(String purchaseToken) { + } +} -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Constants.java +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/adjust/sdk/Constants.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/Constants.java Tue Nov 19 10:17:20 2024 +0300 ++++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/Constants.java Tue Dec 31 18:19:42 2024 +0530 @@ -0,0 +1,18 @@ +// +// Constants.java @@ -414,9 +414,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Const +public interface Constants { + String ADJUST_PREINSTALL_SYSTEM_PROPERTY_PATH = "adjust.preinstall.path"; +} -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/LogLevel.java +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/adjust/sdk/LogLevel.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/LogLevel.java Tue Nov 19 10:17:20 2024 +0300 ++++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/LogLevel.java Tue Dec 31 18:19:42 2024 +0530 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2012-2017 adjust GmbH, @@ -461,9 +461,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/LogLe + return androidLogLevel; + } +} -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/OnAttributionChangedListener.java +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/adjust/sdk/OnAttributionChangedListener.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/OnAttributionChangedListener.java Tue Nov 19 10:17:20 2024 +0300 ++++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/OnAttributionChangedListener.java Tue Dec 31 18:19:42 2024 +0530 @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2012-2017 adjust GmbH, @@ -494,9 +494,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/OnAtt +public interface OnAttributionChangedListener { + void onAttributionChanged(AdjustAttribution attribution); +} -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java Tue Nov 19 10:17:20 2024 +0300 ++++ b/mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java Tue Dec 31 18:19:42 2024 +0530 @@ -0,0 +1,42 @@ +// Copyright 2020 Google LLC +// @@ -540,9 +540,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/google/firebase/ + } + +} -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/RemoteMessage.java +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/RemoteMessage.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/RemoteMessage.java Tue Nov 19 10:17:20 2024 +0300 ++++ b/mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/RemoteMessage.java Tue Dec 31 18:19:42 2024 +0530 @@ -0,0 +1,33 @@ +// Copyright 2020 Google LLC +// @@ -577,9 +577,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/google/firebase/ + } + +} -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/mozilla/components/lib/push/firebase/AbstractFirebasePushService.kt +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/mozilla/components/lib/push/firebase/AbstractFirebasePushService.kt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/mobile/android/fenix/app/src/main/java/mozilla/components/lib/push/firebase/AbstractFirebasePushService.kt Tue Nov 19 10:17:20 2024 +0300 ++++ b/mobile/android/fenix/app/src/main/java/mozilla/components/lib/push/firebase/AbstractFirebasePushService.kt Tue Dec 31 18:19:42 2024 +0530 @@ -0,0 +1,32 @@ +/* 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 @@ -613,9 +613,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/mozilla/components/l + return false + } +} -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt ---- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt Tue Nov 19 10:17:20 2024 +0300 +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt +--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt Tue Dec 31 18:19:42 2024 +0530 @@ -18,7 +18,7 @@ * This feature does not only depend on this flag. It requires the AMO collection override to * be enabled which is behind the Secret Settings. @@ -634,10 +634,10 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/Fe } /** -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt ---- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt Tue Nov 19 10:17:20 2024 +0300 -@@ -1112,19 +1112,16 @@ +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt Tue Dec 31 18:19:42 2024 +0530 +@@ -1105,19 +1105,16 @@ view = view, ) @@ -667,9 +667,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/br screenOrientationFeature.set( feature = ScreenOrientationFeature( -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt ---- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt Tue Nov 19 10:17:20 2024 +0300 +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt +--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt Tue Dec 31 18:19:42 2024 +0530 @@ -10,7 +10,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext @@ -686,10 +686,10 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/co reviewSettings = FenixReviewSettings(settings), ) } -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt ---- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt Tue Nov 19 10:17:20 2024 +0300 -@@ -586,8 +586,14 @@ +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt +--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt Tue Dec 31 18:19:42 2024 +0530 +@@ -587,8 +587,14 @@ } else { defaultTopSites.add( Pair( @@ -706,9 +706,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/co ), ) -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt ---- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt Tue Nov 19 10:17:20 2024 +0300 +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt +--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt Tue Dec 31 18:19:42 2024 +0530 @@ -6,8 +6,6 @@ import android.app.Activity @@ -744,30 +744,30 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/co }, ) { @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/ToolsSubmenu.kt ---- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/ToolsSubmenu.kt Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/ToolsSubmenu.kt Tue Nov 19 10:17:20 2024 +0300 -@@ -210,7 +210,7 @@ +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/ToolsSubmenu.kt +--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/ToolsSubmenu.kt Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/ToolsSubmenu.kt Tue Dec 31 18:19:42 2024 +0530 +@@ -212,7 +212,7 @@ enabled = true, icon = BitmapFactory.decodeResource( LocalContext.current.resources, -- R.drawable.googleg_standard_color_18, +- R.drawable.mozac_ic_web_extension_default_icon, + R.drawable.ic_download, ), badgeText = "1", badgeTextColor = Color.White.toArgb(), -@@ -253,7 +253,7 @@ +@@ -256,7 +256,7 @@ enabled = true, icon = BitmapFactory.decodeResource( LocalContext.current.resources, -- R.drawable.googleg_standard_color_18, +- R.drawable.mozac_ic_web_extension_default_icon, + R.drawable.ic_download, ), badgeText = "1", badgeTextColor = Color.White.toArgb(), -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt ---- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt Tue Nov 19 10:17:20 2024 +0300 +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt +--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt Tue Dec 31 18:19:42 2024 +0530 @@ -6,14 +6,10 @@ import android.content.Context @@ -894,9 +894,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/co + return } } -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt ---- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt Tue Nov 19 10:17:20 2024 +0300 +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt +--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt Tue Dec 31 18:19:42 2024 +0530 @@ -7,9 +7,6 @@ import android.content.Context import android.util.Base64 @@ -936,18 +936,18 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/co } /** -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt ---- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt Tue Nov 19 10:17:20 2024 +0300 -@@ -5,7 +5,6 @@ - package org.mozilla.fenix.home.fake +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt +--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt Tue Dec 31 18:19:42 2024 +0530 +@@ -6,7 +6,6 @@ import android.content.Context + import androidx.compose.runtime.Composable -import com.google.firebase.util.nextAlphanumericString import mozilla.components.browser.state.state.ContentState import mozilla.components.browser.state.state.TabSessionState import mozilla.components.browser.state.state.recover.RecoverableTab -@@ -235,7 +234,7 @@ +@@ -252,7 +251,7 @@ add( RecentTab.Tab( TabSessionState( @@ -956,7 +956,7 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ho content = ContentState( url = URL, ), -@@ -329,9 +328,4 @@ +@@ -392,9 +391,4 @@ private const val URL = "mozilla.com" private fun randomLong() = random.nextLong() @@ -966,9 +966,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ho - length = length, - ) } -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt ---- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt Tue Nov 19 10:17:20 2024 +0300 +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt +--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt Tue Dec 31 18:19:42 2024 +0530 @@ -161,6 +161,12 @@ SupportUtils.MEITUAN_URL -> { binding.faviconImage.setImageDrawable(getDrawable(itemView.context, R.drawable.ic_meituan)) @@ -982,9 +982,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ho else -> { itemView.context.components.core.icons.loadIntoView(binding.faviconImage, topSite.url) } -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt ---- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt Tue Nov 19 10:17:20 2024 +0300 +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt +--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt Tue Dec 31 18:19:42 2024 +0530 @@ -39,6 +39,8 @@ const val GOOGLE_XX_URL = "https://www.google.com/webhp?client=firefox-b-m&channel=ts" const val WHATS_NEW_URL = "https://www.mozilla.org/firefox/android/notes" @@ -994,9 +994,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/se // This is locale-less on purpose so that the content negotiation happens on the AMO side because the current // user language might not be supported by AMO and/or the language might not be exactly what AMO is expecting -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ---- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Mon Nov 18 12:58:35 2024 +0000 -+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Tue Nov 19 10:17:20 2024 +0300 +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Mon Dec 30 18:43:12 2024 +0000 ++++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Tue Dec 31 18:19:42 2024 +0530 @@ -340,7 +340,7 @@ var isTelemetryEnabled by booleanPreference( @@ -1015,7 +1015,7 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ut ) var isOverrideTPPopupsForPerformanceTest = false -@@ -1617,7 +1617,7 @@ +@@ -1627,7 +1627,7 @@ var showPocketRecommendationsFeature by lazyFeatureFlagPreference( appContext.getPreferenceKey(R.string.pref_key_pocket_homescreen_recommendations), featureFlag = FeatureFlags.isPocketRecommendationsFeatureEnabled(appContext), @@ -1024,7 +1024,7 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ut ) /** -@@ -1683,7 +1683,7 @@ +@@ -1693,7 +1693,7 @@ */ var showContileFeature by booleanPreference( key = appContext.getPreferenceKey(R.string.pref_key_enable_contile), @@ -1033,9 +1033,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ut ) /** -diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/res/values/static_strings_extra.xml +diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/res/values/static_strings_extra.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/mobile/android/fenix/app/src/main/res/values/static_strings_extra.xml Tue Nov 19 10:17:20 2024 +0300 ++++ b/mobile/android/fenix/app/src/main/res/values/static_strings_extra.xml Tue Dec 31 18:19:42 2024 +0530 @@ -0,0 +1,8 @@ + + @@ -1095,10 +1095,10 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/res/xml/site_permissions_ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/patches/fenix-overlay/res/drawable/ic_launcher_monochrome.xml b/patches/fenix-overlay/res/drawable/ic_launcher_monochrome.xml index 0eb1601..f6db441 100644 --- a/patches/fenix-overlay/res/drawable/ic_launcher_monochrome.xml +++ b/patches/fenix-overlay/res/drawable/ic_launcher_monochrome.xml @@ -1,15 +1,16 @@ + + android:scaleX="0.64166665" + android:scaleY="0.64166665" + android:translateX="5.733333" + android:translateY="5.733333"> + android:pathData="M21.469,5.49C21.397,5.477 21.32,5.53 21.32,5.615L21.292,10.315C21.291,10.481 21.156,10.615 20.99,10.615L10.958,10.615C10.792,10.615 10.66,10.481 10.659,10.315L10.641,5.615C10.64,5.563 10.61,5.517 10.563,5.497C10.516,5.478 10.461,5.49 10.424,5.526L5.536,10.328C5.418,10.444 5.322,10.673 5.323,10.839C5.408,19.839 10.375,22.462 15.747,26.438C15.88,26.535 16.099,26.535 16.232,26.438C21.708,22.44 26.562,20.107 26.677,10.917C26.679,10.752 26.584,10.523 26.466,10.406L21.536,5.526C21.517,5.506 21.493,5.494 21.469,5.49zM10.628,15.948L13.971,17.938C12.721,19.188 12.623,19.286 10.628,15.948zM21.32,15.948C19.325,19.286 19.227,19.188 17.977,17.938L21.32,15.948z" /> diff --git a/patches/fenix-overlay/res/drawable/ic_launcher_private_foreground.xml b/patches/fenix-overlay/res/drawable/ic_launcher_private_foreground.xml index 84efc7d..be6406b 100644 --- a/patches/fenix-overlay/res/drawable/ic_launcher_private_foreground.xml +++ b/patches/fenix-overlay/res/drawable/ic_launcher_private_foreground.xml @@ -1,37 +1,32 @@ - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher.xml b/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher.xml index 10bc7a5..f30783b 100644 --- a/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,6 @@ - - - - + + + + \ No newline at end of file diff --git a/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_private.xml b/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_private.xml index e6e7d57..62caf4a 100644 --- a/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_private.xml +++ b/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_private.xml @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_private_round.xml b/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_private_round.xml index e6e7d57..62caf4a 100644 --- a/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_private_round.xml +++ b/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_private_round.xml @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_round.xml b/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_round.xml index 10bc7a5..1084c24 100644 --- a/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -3,4 +3,4 @@ - + \ No newline at end of file diff --git a/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher.webp b/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher.webp index 0fa339f..f3ca8c4 100644 Binary files a/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher.webp and b/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_private.webp b/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_private.webp index 737ee06..e624479 100644 Binary files a/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_private.webp and b/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_private.webp differ diff --git a/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_private_round.webp b/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_private_round.webp index 6a896e6..5ae216b 100644 Binary files a/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_private_round.webp and b/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_private_round.webp differ diff --git a/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_round.webp b/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_round.webp index d9cf0f5..06860dd 100644 Binary files a/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_round.webp and b/patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher.webp b/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher.webp index 0fb54ea..641618e 100644 Binary files a/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher.webp and b/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_private.webp b/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_private.webp index f4d28a1..de4d206 100644 Binary files a/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_private.webp and b/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_private.webp differ diff --git a/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_private_round.webp b/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_private_round.webp index a4416cc..3d17428 100644 Binary files a/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_private_round.webp and b/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_private_round.webp differ diff --git a/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_round.webp b/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_round.webp index 543e08f..defe275 100644 Binary files a/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_round.webp and b/patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher.webp b/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher.webp index f90abee..36c78fe 100644 Binary files a/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher.webp and b/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_private.webp b/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_private.webp index 90af7be..2926c45 100644 Binary files a/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_private.webp and b/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_private.webp differ diff --git a/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_private_round.webp b/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_private_round.webp index ca3b5a5..3ce4855 100644 Binary files a/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_private_round.webp and b/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_private_round.webp differ diff --git a/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_round.webp b/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_round.webp index 43b54bd..81c7e0c 100644 Binary files a/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_round.webp and b/patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher.webp b/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher.webp index 6e2e78f..876d413 100644 Binary files a/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher.webp and b/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_private.webp b/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_private.webp index 742060d..780747a 100644 Binary files a/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_private.webp and b/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_private.webp differ diff --git a/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_private_round.webp b/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_private_round.webp index 801b5eb..e4469e0 100644 Binary files a/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_private_round.webp and b/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_private_round.webp differ diff --git a/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_round.webp b/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_round.webp index e4a2e04..ea44958 100644 Binary files a/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_round.webp and b/patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher.webp b/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher.webp index a0e2f08..5bfe306 100644 Binary files a/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher.webp and b/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_private.webp b/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_private.webp index b1cdd38..e5d9a3c 100644 Binary files a/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_private.webp and b/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_private.webp differ diff --git a/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_private_round.webp b/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_private_round.webp index afa3db9..be9a273 100644 Binary files a/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_private_round.webp and b/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_private_round.webp differ diff --git a/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_round.webp b/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_round.webp index 168dd1c..9596a1f 100644 Binary files a/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/scripts/get_sources.sh b/scripts/get_sources.sh index 722f0f7..2310c0c 100755 --- a/scripts/get_sources.sh +++ b/scripts/get_sources.sh @@ -2,11 +2,11 @@ set -euo pipefail -FIREFOX_TAG="FIREFOX-ANDROID_133_0_3_RELEASE" +FIREFOX_TAG="FIREFOX-ANDROID_134_0_RELEASE" WASI_TAG="wasi-sdk-20" -GLEAN_TAG="v61.2.0" +GLEAN_TAG="v62.0.0" GMSCORE_TAG="v0.3.6.244735" -APPSERVICES_TAG="v133.0" +APPSERVICES_TAG="v134.0" # Configuration ROOTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" diff --git a/scripts/prebuild.sh b/scripts/prebuild.sh index fd16810..93f25e0 100755 --- a/scripts/prebuild.sh +++ b/scripts/prebuild.sh @@ -228,7 +228,7 @@ pushd "$application_services" chmod +x libs/*.sh chmod +x automation/publish_to_maven_local_if_modified.py # Break the dependency on older A-C -sed -i -e '/android-components = /s/131\.0\.2/133.0.3/' gradle/libs.versions.toml +sed -i -e '/android-components = /s/132\.0/134.0/' gradle/libs.versions.toml echo "rust.targets=linux-x86-64,$rusttarget" >>local.properties sed -i -e '/NDK ez-install/,/^$/d' libs/verify-android-ci-environment.sh sed -i -e '/content {/,/}/d' build.gradle @@ -323,6 +323,11 @@ fi echo "ac_add_options --with-gradle=$(command -v gradle)" echo "ac_add_options --with-libclang-path=\"$libclang\"" echo "ac_add_options --with-wasi-sysroot=\"$wasi_install/share/wasi-sysroot\"" + + if [[ -n ${SB_GAPI_KEY_FILE+x} ]]; then + echo "--with-google-safebrowsing-api-keyfile=${SB_GAPI_KEY_FILE}" + fi + echo "ac_add_options WASM_CC=\"$wasi_install/bin/clang\"" echo "ac_add_options WASM_CXX=\"$wasi_install/bin/clang++\"" echo "ac_add_options CC=\"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/clang\""