diff options
| -rw-r--r-- | libinit/Android.bp | 12 | ||||
| -rw-r--r-- | libinit/init_xiaomi_holi.cpp | 13 | ||||
| -rw-r--r-- | libinit/init_xiaomi_veux.cpp | 2 | ||||
| -rw-r--r-- | libinit/libinit_dalvik_heap.cpp | 2 | ||||
| -rw-r--r-- | libinit/libinit_variant.cpp | 3 |
5 files changed, 5 insertions, 27 deletions
diff --git a/libinit/Android.bp b/libinit/Android.bp index d3ed028..480a05a 100644 --- a/libinit/Android.bp +++ b/libinit/Android.bp @@ -7,13 +7,13 @@ cc_library_static { name: "init_xiaomi_veux", srcs: ["init_xiaomi_veux.cpp"], - whole_static_libs: ["//device/xiaomi/veux:libinit_xiaomi_holi"], + whole_static_libs: ["libinit_xiaomi_veux"], include_dirs: ["system/core/init"], recovery_available: true, } cc_library_static { - name: "libinit_xiaomi_holi", + name: "libinit_xiaomi_veux", srcs: [ "libinit_dalvik_heap.cpp", "libinit_variant.cpp", @@ -23,11 +23,3 @@ cc_library_static { export_include_dirs: ["include"], recovery_available: true, } - -cc_library_static { - name: "init_xiaomi_holi", - srcs: ["init_xiaomi_holi.cpp"], - whole_static_libs: ["libinit_xiaomi_holi"], - include_dirs: ["system/core/init"], - recovery_available: true, -}
\ No newline at end of file diff --git a/libinit/init_xiaomi_holi.cpp b/libinit/init_xiaomi_holi.cpp deleted file mode 100644 index 22cb31e..0000000 --- a/libinit/init_xiaomi_holi.cpp +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (C) 2022 The LineageOS Project - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include <libinit_dalvik_heap.h> - -#include "vendor_init.h" - -void vendor_load_properties() { - set_dalvik_heap(); -} diff --git a/libinit/init_xiaomi_veux.cpp b/libinit/init_xiaomi_veux.cpp index cc9e2e5..5f25d57 100644 --- a/libinit/init_xiaomi_veux.cpp +++ b/libinit/init_xiaomi_veux.cpp @@ -127,4 +127,4 @@ static const std::vector<variant_info_t> variants = { void vendor_load_properties() { search_variant(variants); set_dalvik_heap(); -}
\ No newline at end of file +} diff --git a/libinit/libinit_dalvik_heap.cpp b/libinit/libinit_dalvik_heap.cpp index b3b24ba..4eb4748 100644 --- a/libinit/libinit_dalvik_heap.cpp +++ b/libinit/libinit_dalvik_heap.cpp @@ -5,8 +5,8 @@ */ #include <sys/sysinfo.h> -#include <libinit_utils.h> +#include <libinit_utils.h> #include <libinit_dalvik_heap.h> #define HEAPSTARTSIZE_PROP "dalvik.vm.heapstartsize" diff --git a/libinit/libinit_variant.cpp b/libinit/libinit_variant.cpp index 99babbf..2c693c5 100644 --- a/libinit/libinit_variant.cpp +++ b/libinit/libinit_variant.cpp @@ -6,13 +6,12 @@ #include <android-base/logging.h> #include <android-base/properties.h> -#include <libinit_utils.h> +#include <libinit_utils.h> #include <libinit_variant.h> using android::base::GetProperty; - #define HWC_PROP "ro.boot.hwc" #define MODEL_PROP "ro.boot.board_id" #define SKU_PROP "ro.boot.product.hardware.sku" |