From d284d16ebc07f5ee2f9cbf038fca68f6804f4434 Mon Sep 17 00:00:00 2001 From: basamaryan Date: Sat, 20 Apr 2024 01:29:54 +0200 Subject: [PATCH] miuicamera: Adapt for sweet Change-Id: Iacdc37db9bca48fdba8272d231a1ac484baed827 --- common/Android.bp | 2 +- common/Android.mk | 2 +- common/BoardConfigVendor.mk | 2 +- common/common-vendor.mk | 4 ++-- extract-files.sh | 2 +- products/board.mk | 2 +- products/miuicamera.mk | 6 +++--- setup-makefiles.sh | 8 ++++---- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/common/Android.bp b/common/Android.bp index 2ac948c..e75334b 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -1,6 +1,6 @@ // Automatically generated file. DO NOT MODIFY // -// This file is generated by vendor/xiaomi/garnet-miuicamera/setup-makefiles.sh +// This file is generated by vendor/xiaomi/sweet-miuicamera/setup-makefiles.sh soong_namespace { imports: [ diff --git a/common/Android.mk b/common/Android.mk index 4a8ccfe..9465305 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -1,6 +1,6 @@ # Automatically generated file. DO NOT MODIFY # -# This file is generated by vendor/xiaomi/garnet-miuicamera/setup-makefiles.sh +# This file is generated by vendor/xiaomi/sweet-miuicamera/setup-makefiles.sh LOCAL_PATH := $(call my-dir) diff --git a/common/BoardConfigVendor.mk b/common/BoardConfigVendor.mk index e8025e7..e7f2cca 100644 --- a/common/BoardConfigVendor.mk +++ b/common/BoardConfigVendor.mk @@ -1,4 +1,4 @@ # Automatically generated file. DO NOT MODIFY # -# This file is generated by vendor/xiaomi/garnet-miuicamera/setup-makefiles.sh +# This file is generated by vendor/xiaomi/sweet-miuicamera/setup-makefiles.sh diff --git a/common/common-vendor.mk b/common/common-vendor.mk index 1d49151..dda880d 100644 --- a/common/common-vendor.mk +++ b/common/common-vendor.mk @@ -1,7 +1,7 @@ # Automatically generated file. DO NOT MODIFY # -# This file is generated by vendor/xiaomi/garnet-miuicamera/setup-makefiles.sh +# This file is generated by vendor/xiaomi/sweet-miuicamera/setup-makefiles.sh PRODUCT_SOONG_NAMESPACES += \ - vendor/xiaomi/garnet-miuicamera/common + vendor/xiaomi/sweet-miuicamera/common diff --git a/extract-files.sh b/extract-files.sh index 180b796..c959fa3 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -9,7 +9,7 @@ set -e DEVICE=common -VENDOR=xiaomi/garnet-miuicamera +VENDOR=xiaomi/sweet-miuicamera # Load extract_utils and do some sanity checks MY_DIR="${BASH_SOURCE%/*}" diff --git a/products/board.mk b/products/board.mk index ced9192..6cd70f6 100644 --- a/products/board.mk +++ b/products/board.mk @@ -14,4 +14,4 @@ # limitations under the License. # -include vendor/xiaomi/garnet-miuicamera/common/BoardConfigVendor.mk +include vendor/xiaomi/sweet-miuicamera/common/BoardConfigVendor.mk diff --git a/products/miuicamera.mk b/products/miuicamera.mk index 27dd8b6..9432648 100644 --- a/products/miuicamera.mk +++ b/products/miuicamera.mk @@ -16,11 +16,11 @@ # Permissions PRODUCT_COPY_FILES += \ - vendor/xiaomi/garnet-miuicamera/configs/permissions/privapp-permissions-miuicamera.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-miuicamera.xml + vendor/xiaomi/sweet-miuicamera/configs/permissions/privapp-permissions-miuicamera.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-miuicamera.xml # Sysconfig PRODUCT_COPY_FILES += \ - vendor/xiaomi/garnet-miuicamera/configs/sysconfig/miuicamera-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/miuicamera-hiddenapi-package-whitelist.xml + vendor/xiaomi/sweet-miuicamera/configs/sysconfig/miuicamera-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/miuicamera-hiddenapi-package-whitelist.xml # Props PRODUCT_SYSTEM_PROPERTIES += \ @@ -28,4 +28,4 @@ PRODUCT_SYSTEM_PROPERTIES += \ ro.com.google.lens.oem_camera_package=com.android.camera \ vendor.camera.aux.packagelist=com.android.camera -$(call inherit-product, vendor/xiaomi/garnet-miuicamera/common/common-vendor.mk) +$(call inherit-product, vendor/xiaomi/sweet-miuicamera/common/common-vendor.mk) diff --git a/setup-makefiles.sh b/setup-makefiles.sh index dae2175..39cca1a 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -9,7 +9,7 @@ set -e DEVICE=common -VENDOR=xiaomi/garnet-miuicamera +VENDOR=xiaomi/sweet-miuicamera # Load extract_utils and do some sanity checks MY_DIR="${BASH_SOURCE%/*}" @@ -30,11 +30,11 @@ setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" true # Warning headers and guards write_headers "arm64" sed -i 's|TARGET_DEVICE|TARGET_ARCH|g' "${ANDROIDMK}" -sed -i 's|vendor/xiaomi/garnet-miuicamera/|vendor/xiaomi/garnet-miuicamera/common|g' "${PRODUCTMK}" -sed -i 's|device/xiaomi/garnet-miuicamera//setup-makefiles.sh|vendor/xiaomi/garnet-miuicamera/setup-makefiles.sh|g' "${ANDROIDBP}" "${ANDROIDMK}" "${BOARDMK}" "${PRODUCTMK}" +sed -i 's|vendor/xiaomi/sweet-miuicamera/|vendor/xiaomi/sweet-miuicamera/common|g' "${PRODUCTMK}" +sed -i 's|device/xiaomi/sweet-miuicamera//setup-makefiles.sh|vendor/xiaomi/sweet-miuicamera/setup-makefiles.sh|g' "${ANDROIDBP}" "${ANDROIDMK}" "${BOARDMK}" "${PRODUCTMK}" write_makefiles "${MY_DIR}/proprietary-files.txt" true -sed -i 's|"xiaomi/garnet-miuicamera"|"xiaomi"|g' "${ANDROIDBP}" +sed -i 's|"xiaomi/sweet-miuicamera"|"xiaomi"|g' "${ANDROIDBP}" # Finish write_footers