From 1a1afaf252bf45aca43de2e74408e6368d0c9cb6 Mon Sep 17 00:00:00 2001
From: shuixx <shuixx@shuixx.com>
Date: Sun, 2 Feb 2025 12:21:30 +0800
Subject: [PATCH] update

---
 config.mk                                     |  9 ++++---
 fonts/Android.bp                              | 14 ++++++++++
 fonts/fonts.mk                                |  2 --
 fonts/fonts.xml                               | 23 ++++++++++++++++
 .../base/core/res/res/values/fonts.xml        | 25 ------------------
 prebuilts/Android.bp                          | 26 ++++++-------------
 6 files changed, 50 insertions(+), 49 deletions(-)
 create mode 100644 fonts/Android.bp
 delete mode 100644 fonts/fonts.mk
 create mode 100644 fonts/fonts.xml
 delete mode 100644 fonts/overlay/frameworks/base/core/res/res/values/fonts.xml

diff --git a/config.mk b/config.mk
index 339bbb2..1fb9565 100644
--- a/config.mk
+++ b/config.mk
@@ -1,13 +1,14 @@
 LOCAL_PATH := $(call my-dir)
 include $(call all-subdir-makefiles,$(LOCAL_PATH))
 
-include vendor/custom/fonts/fonts.mk
-
 # Include prebuilts packages
 include vendor/custom/prebuilts/prebuilts.mk
 RELAX_USES_LIBRARY_CHECK=true
-BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES=true
 
 TARGET_EXCLUDE_PACKAGES += \
     Seedvault \
-    XiaomiEuicc \
+    XiaomiEuicc
+
+PRODUCT_PACKAGES -= \
+    Seedvault \
+    XiaomiEuicc
\ No newline at end of file
diff --git a/fonts/Android.bp b/fonts/Android.bp
new file mode 100644
index 0000000..f8de1e0
--- /dev/null
+++ b/fonts/Android.bp
@@ -0,0 +1,14 @@
+prebuilt_etc {
+    name: "my_fonts",
+    srcs: [
+        "fonts/LXGWWenKai-Light.ttf",
+        "fonts/LXGWWenKai-Medium.ttf",
+        "fonts/LXGWWenKai-Regular.ttf",
+        "fonts/LXGWWenKaiMono-Light.ttf",
+        "fonts/LXGWWenKaiMono-Medium.ttf",
+        "fonts/LXGWWenKaiMono-Regular.ttf",
+    ],
+    dst: "fonts/",
+    installable: true,
+    permissions: "0644",
+}
diff --git a/fonts/fonts.mk b/fonts/fonts.mk
deleted file mode 100644
index 0f0015f..0000000
--- a/fonts/fonts.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copy files
-PRODUCT_COPY_FILES += $(call find-copy-subdir-files,*,vendor/custom/fonts/fonts,$(TARGET_COPY_OUT_SYSTEM)/fonts)
diff --git a/fonts/fonts.xml b/fonts/fonts.xml
new file mode 100644
index 0000000..b0b6371
--- /dev/null
+++ b/fonts/fonts.xml
@@ -0,0 +1,23 @@
+<family>
+    <nameset>
+        <name>LXGWWenKai</name>
+    </nameset>
+    <fileset>
+        <file>LXGWWenKai-Light.ttf</file>
+        <file weight="300">LXGWWenKai-Light.ttf</file>
+        <file weight="400">LXGWWenKai-Regular.ttf</file>
+        <file weight="700">LXGWWenKai-Medium.ttf</file>
+    </fileset>
+</family>
+
+<family>
+    <nameset>
+        <name>LXGWWenKaiMono</name>
+    </nameset>
+    <fileset>
+        <file>LXGWWenKaiMono-Light.ttf</file>
+        <file weight="300">LXGWWenKaiMono-Light.ttf</file>
+        <file weight="400">LXGWWenKaiMono-Regular.ttf</file>
+        <file weight="700">LXGWWenKaiMono-Medium.ttf</file>
+    </fileset>
+</family>
\ No newline at end of file
diff --git a/fonts/overlay/frameworks/base/core/res/res/values/fonts.xml b/fonts/overlay/frameworks/base/core/res/res/values/fonts.xml
deleted file mode 100644
index 9b7fd58..0000000
--- a/fonts/overlay/frameworks/base/core/res/res/values/fonts.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<familyset>
-    <family>
-        <nameset>
-            <name>LXGWWenKai</name>
-        </nameset>
-        <fileset>
-            <file>LXGWWenKai-Light.ttf</file>
-            <file weight="300">LXGWWenKai-Light.ttf</file>
-            <file weight="400">LXGWWenKai-Regular.ttf</file>
-            <file weight="700">LXGWWenKai-Medium.ttf</file>
-        </fileset>
-    </family>
-    <family>
-        <nameset>
-            <name>LXGWWenKaiMono</name>
-        </nameset>
-        <fileset>
-            <file>LXGWWenKaiMono-Light.ttf</file>
-            <file weight="300">LXGWWenKaiMono-Light.ttf</file>
-            <file weight="400">LXGWWenKaiMono-Regular.ttf</file>
-            <file weight="700">LXGWWenKaiMono-Medium.ttf</file>
-        </fileset>
-    </family>
-</familyset>
diff --git a/prebuilts/Android.bp b/prebuilts/Android.bp
index 6dbc1d8..f355346 100644
--- a/prebuilts/Android.bp
+++ b/prebuilts/Android.bp
@@ -1,22 +1,12 @@
-soong_namespace {
-	imports: [
-	],
-}
 
 cc_prebuilt_binary {
-    name: "wg",
-    srcs: ["product/bin/wg"],
-    installable: true,
-}
-
-cc_prebuilt_binary {
-    name: "wg-quick",
-    srcs: ["product/bin/wg-quick"],
-    installable: true,
-}
-
-cc_prebuilt_binary {
-    name: "vim",
-    srcs: ["product/bin/vim"],
+    name: "my_binaries",
+    srcs: [
+        "product/bin/wg",
+        "product/bin/wg-quick",
+        "product/bin/vim",
+    ],
+    dst: "product/bin/",
     installable: true,
+    permissions: "0755",
 }