From 228e5a4c76ad5f97409c912d07699b49ba4bb162 Mon Sep 17 00:00:00 2001
From: Lucas Fernandes Nogueira <lucas@tauri.studio>
Date: Tue, 26 Sep 2023 15:22:23 -0300
Subject: [PATCH] fix(cli): icons not added to the Android project (#7902)

---
 .changes/fix-icons-android.md |  6 ++++++
 tooling/cli/src/icon.rs       | 26 +++++---------------------
 2 files changed, 11 insertions(+), 21 deletions(-)
 create mode 100644 .changes/fix-icons-android.md

diff --git a/.changes/fix-icons-android.md b/.changes/fix-icons-android.md
new file mode 100644
index 000000000..650b3f0df
--- /dev/null
+++ b/.changes/fix-icons-android.md
@@ -0,0 +1,6 @@
+---
+"@tauri-apps/cli": patch:bug
+"tauri-cli": patch:bug
+---
+
+Fixes `icon` command not writing files to the correct Android project folders.
diff --git a/tooling/cli/src/icon.rs b/tooling/cli/src/icon.rs
index 652c3af15..3732caec4 100644
--- a/tooling/cli/src/icon.rs
+++ b/tooling/cli/src/icon.rs
@@ -2,10 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use crate::{
-  helpers::{app_paths::tauri_dir, config::get as get_tauri_config},
-  Result,
-};
+use crate::{helpers::app_paths::tauri_dir, Result};
 
 use std::{
   collections::HashMap,
@@ -27,7 +24,6 @@ use image::{
   open, ColorType, DynamicImage, ImageBuffer, ImageEncoder, Rgba,
 };
 use serde::Deserialize;
-use tauri_utils::platform::Target;
 
 #[derive(Debug, Deserialize)]
 struct IcnsEntry {
@@ -361,22 +357,10 @@ fn png(source: &DynamicImage, out_dir: &Path, ios_color: Rgba<u8>) -> Result<()>
 
   let mut entries = desktop_entries(out_dir);
 
-  // Android
-  let (config, _metadata) = {
-    let tauri_config = get_tauri_config(Target::current(), None)?;
-
-    let tauri_config_guard = tauri_config.lock().unwrap();
-    let tauri_config_ = tauri_config_guard.as_ref().unwrap();
-    crate::mobile::android::get_config(
-      &crate::mobile::get_app(tauri_config_),
-      tauri_config_,
-      &Default::default(),
-    )
-  };
-  let android_out = out_dir.parent().unwrap().join(format!(
-    "gen/android/{}/app/src/main/res/",
-    config.app().name_snake()
-  ));
+  let android_out = out_dir
+    .parent()
+    .unwrap()
+    .join("gen/android/app/src/main/res/");
   let out = if android_out.exists() {
     android_out
   } else {