From 59ed1a0d66782ac37d4959eb6a530ce7ee4e9253 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Sat, 20 Nov 2021 04:22:17 +0900 Subject: [PATCH] vendor_detect: convert to python3 script * Binaries are subject to os env --- universal7885-common/vendor_detect/main.cpp | 29 --------------------- universal7885-common/vendor_detect/main.py | 25 ++++++++++++++++++ universal7885-common/vendorsetup.sh | 9 +++---- 3 files changed, 28 insertions(+), 35 deletions(-) delete mode 100644 universal7885-common/vendor_detect/main.cpp create mode 100644 universal7885-common/vendor_detect/main.py diff --git a/universal7885-common/vendor_detect/main.cpp b/universal7885-common/vendor_detect/main.cpp deleted file mode 100644 index efc823f..0000000 --- a/universal7885-common/vendor_detect/main.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include -#include -#include -using namespace std; -std::vector get_directories(const std::string& s) -{ - std::vector r; - for(auto& p : std::filesystem::recursive_directory_iterator(s)) - if (p.is_directory()) - r.push_back(p.path().string()); - return r; -} -int main(){ - std::vector vendors = get_directories("vendor"); - for (int i = 0; i < vendors.size(); i++){ - std::string name = vendors[i].substr(7, vendors[i].length()); - name = name.substr(0, name.find('/')); - if (name != "qcom" && name != "nxp" && name != "samsung" - && name != "gapps" && name != "google" && - name != "gms" && name != "codeaurora"){ - ofstream output; - output.open("device/samsung/universal7885-common/vendor_name"); - output << name; - output.close(); - } - } - return 0; -} diff --git a/universal7885-common/vendor_detect/main.py b/universal7885-common/vendor_detect/main.py new file mode 100644 index 0000000..8e9a379 --- /dev/null +++ b/universal7885-common/vendor_detect/main.py @@ -0,0 +1,25 @@ +import os +import argparse +parser = argparse.ArgumentParser() +parser.add_argument("-d", help="Debug", type=int) +args = parser.parse_args() +var = vars(args) +DEBUG = var['d'] == 1 +blacklist = ["qcom", "nxp", "samsung", "gapps", "google", "gms", "codeaurora"] +vendors = os.listdir("vendor") +for vendor in vendors: + if DEBUG: + print("Found vendor " + vendor) + if vendor in blacklist: + if DEBUG: + print("Vendor " + vendor + " in blacklist. Skipping...") + else: + if DEBUG: + print("Vendor " + vendor + " not in blacklist. Writing...") + f = open("device/samsung/universal7885-common/vendor_name", "a") + f.write(vendor) + f.close() + break + + + diff --git a/universal7885-common/vendorsetup.sh b/universal7885-common/vendorsetup.sh index 34baacb..d00b82c 100644 --- a/universal7885-common/vendorsetup.sh +++ b/universal7885-common/vendorsetup.sh @@ -7,13 +7,10 @@ git clone https://github.com/lineageos/android_hardware_samsung_nfc hardware/sam git clone https://github.com/lineageos/android_hardware_samsung_slsi_libbt hardware/samsung_slsi/libbt git clone https://github.com/lineageos/android_hardware_samsung_slsi_scsc_wifibt_wifi_hal hardware/samsung_slsi/scsc_wifibt/wifi_hal git clone https://github.com/lineageos/android_hardware_samsung_slsi_scsc_wifibt_wpa_supplicant_lib hardware/samsung_slsi/scsc_wifibt/wpa_supplicant_lib -if ! test -f vendor_detect; then -clang++ device/samsung/universal7885-common/vendor_detect/main.cpp -o vendor_detect -std=c++17 +if test -f device/samsung/universal7885-common/vendor_name; then +rm device/samsung/universal7885-common/vendor_name fi -if ! test -f device/samsung/universal7885-common/vendor_name; then -touch device/samsung/universal7885-common/vendor_name -fi -./vendor_detect +python3 device/samsung/universal7885-common/vendor_detect/main.py -d 0 echo "Generating A20 Makefiles" ./device/samsung/a20/setup.sh echo "Generating A20e Makefiles"