devices: Use their repective original build fingerprint

- Kill fingerprint fetcher CI
- Sperate SPL dates based on VT
- Purge derp remains
This commit is contained in:
roynatech2544 2023-11-28 14:54:26 +09:00
commit a06bd4bac2
No known key found for this signature in database
GPG key ID: 389DAC92CAECBBCC
18 changed files with 44 additions and 236 deletions

View file

@ -1,16 +0,0 @@
name: check fp update
on:
schedule:
- cron: '0 7 * * 2,5'
workflow_dispatch:
jobs:
update:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v2
- name: Install dependencies
run: bash universal7885-common/host-tools/update_fp.sh

View file

@ -15,6 +15,9 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3556769792 # 3.31GB
BOARD_CACHEIMAGE_PARTITION_SIZE := 157286400
BOARD_VENDORIMAGE_PARTITION_SIZE := 394264576
# SPL
VENDOR_SECURITY_PATCH := 2021-12-01
# Inherit common board flags
include device/samsung/universal7885-common/BoardConfigCommon.mk

View file

@ -18,3 +18,7 @@ TARGET_SCREEN_WIDTH := 720
PRODUCT_PACKAGES += \
fstab.exynos7884B
BUILD_FINGERPRINT := "samsung/a10kx/a10:11/RP1A.200720.012/A105NKOU5CUL4:user/release-keys"
PRODUCT_BUILD_PROP_OVERRIDES += \
PRIVATE_BUILD_DESC="a10kx-user 11 RP1A.200720.012 A105NKOU5CUL4 release-keys"

View file

@ -18,4 +18,7 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 452984832
# Inherit common board flags
include device/samsung/universal7885-common/BoardConfigCommon.mk
# SPL
VENDOR_SECURITY_PATCH := 2021-06-01
TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop

View file

@ -9,9 +9,6 @@ $(call inherit-product, vendor/samsung/a20/a20-vendor.mk)
$(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
# Derp
DERP_BUILDTYPE := Official
# USB
PRODUCT_PACKAGES += \
android.hardware.usb-service.samsung
@ -27,3 +24,8 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
android.hardware.sensors@1.0-service
BUILD_FINGERPRINT := "samsung/a20ub/a20:11/RP1A.200720.012/A205GUBU9CUF4:user/release-keys"
PRODUCT_BUILD_PROP_OVERRIDES += \
PRIVATE_BUILD_DESC="a20ub-user 11 RP1A.200720.012 A205GUBU9CUF4 release-keys"

View file

@ -18,4 +18,7 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 452984832
# Inherit common board flags
include device/samsung/universal7885-common/BoardConfigCommon.mk
# SPL
VENDOR_SECURITY_PATCH := 2022-01-01
TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop

View file

@ -18,4 +18,7 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 452984832
# Inherit common board flags
include device/samsung/universal7885-common/BoardConfigCommon.mk
# SPL
VENDOR_SECURITY_PATCH := 2022-10-01
TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop

View file

@ -26,3 +26,8 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
android.hardware.sensors@1.0-service
BUILD_FINGERPRINT := "samsung/a30cis/a30:11/RP1A.200720.012/A305FNXXU6CUI2:user/release-keys"
PRODUCT_BUILD_PROP_OVERRIDES += \
PRIVATE_BUILD_DESC="a30cis-user 11 RP1A.200720.012 A305FNXXU6CUI2 release-keys"

View file

@ -24,4 +24,7 @@ TARGET_SURFACEFLINGER_UDFPS_LIB := //$(DEVICE_PATH):libudfps_extension.a30s
# Inherit common board flags
include device/samsung/universal7885-common/BoardConfigCommon.mk
# SPL
VENDOR_SECURITY_PATCH := 2021-11-01
TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop

View file

@ -28,3 +28,8 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
android.hardware.sensors@1.0-service
BUILD_FINGERPRINT := "samsung/a30sub/a30s:11/RP1A.200720.012/A307GUBS4CUJ1:user/release-keys"
PRODUCT_BUILD_PROP_OVERRIDES += \
PRIVATE_BUILD_DESC="a30sub-user 11 RP1A.200720.012 A307GUBS4CUJ1 release-keys"

View file

@ -18,4 +18,7 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 452984832
# Inherit common board flags
include device/samsung/universal7885-common/BoardConfigCommon.mk
# SPL
VENDOR_SECURITY_PATCH := 2022-02-01
TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop

View file

@ -26,3 +26,8 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
android.hardware.sensors@1.0-service
BUILD_FINGERPRINT := "samsung/a40skt/a40:11/RP1A.200720.012/A405SKSU5CVB1:user/release-keys"
PRODUCT_BUILD_PROP_OVERRIDES += \
PRIVATE_BUILD_DESC="a40skt-user 11 RP1A.200720.012 A405SKSU5CVB1 release-keys"

View file

@ -132,7 +132,6 @@ SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += \
# Vendor
TARGET_COPY_OUT_VENDOR := vendor
VENDOR_SECURITY_PATCH := 2023-02-05
# Wifi
BOARD_WLAN_DEVICE := slsi

View file

@ -1,7 +0,0 @@
# Autogenerated by BuildFpUpdater.cc
PRODUCT_GMS_CLIENTID_BASE := android-google
BUILD_FINGERPRINT := "google/cheetah/cheetah:13/TQ3A.230901.001/10750268:user/release-keys"
PRODUCT_BUILD_PROP_OVERRIDES += \
PRIVATE_BUILD_DESC="cheetah-user 13 TQ3A.230901.001 10750268 release-keys"

View file

@ -1 +0,0 @@
updater

View file

@ -1,190 +0,0 @@
#include <curl/curl.h>
#include <iostream>
#include <string>
#include <sstream>
#include <vector>
#include <fstream>
#include <memory>
// Tracking Evolution-X's PixelPropsUtils
constexpr const char *UPSTREAM_URL = "https://raw.githubusercontent.com/Evolution-X/frameworks_base/tiramisu/core/java/com/android/internal/util/evolution/PixelPropsUtils.java";
// Use Pixel 7's fingerprint
constexpr const char *DEVICE_CODENAME = "cheetah";
constexpr const char *DEVICE_VENDOR = "google";
constexpr bool STD_STRING_CONTAINS(const std::string& str, const std::string& search) {
return str.find(search) != std::string::npos;
}
struct __attribute__((aligned(64))) result {
bool vaild = false;
std::string data;
};
using result_t = struct result;
struct __attribute__((aligned(128))) build_data {
std::string vendor;
std::string codename;
int android_version = -1;
std::string buildid;
std::string vendordata;
};
static auto WriteCallback(void *contents, size_t size, size_t nmemb,
void *userp) {
static_cast<std::string *>(userp)->append(static_cast<char *>(contents), size * nmemb);
return size * nmemb;
}
static auto splitNewLines (const std::string& buffer)
{
auto result = std::vector<std::string>{};
auto sstream = std::stringstream{buffer};
for (std::string line; std::getline(sstream, line, '\n');) {
result.push_back(line);
}
return result;
}
static auto checkIfVaild(const std::string& line)
{
auto res = std::make_unique<result_t>();
// Is it related to <codename>?
if (!STD_STRING_CONTAINS(line, DEVICE_CODENAME)) {
return res;
}
// Remove non-fingerprint stuff.
// It should be <vendor>/<codename>/.. format
if (!STD_STRING_CONTAINS(line, DEVICE_VENDOR)) {
return res;
}
res->vaild = true;
res->data = line;
return res;
}
static auto parseJavaFile(const std::string& buffer)
{
auto kLines = splitNewLines(buffer);
for (const auto &line : kLines) {
auto res = checkIfVaild(line);
if (!res->vaild) {
res.reset();
} else {
std::string data = res->data;
res->data = data.substr(data.find(DEVICE_VENDOR));
data = res->data;
res->data = data.substr(0, data.find_last_of('"'));
return res;
}
}
// We failed to find the line. return nothing.
return std::make_unique<result_t>();
}
static auto dirname(const std::string& arg)
{
auto idx = arg.find_last_of("/\\");
return arg.substr(0, idx);
}
static auto fromBuildDataToFP(struct build_data *data)
{
const char *fmt = "%s/%s/%s:%d/%s/%s:user/release-keys";
const int size = std::snprintf(nullptr, 0, fmt, data->vendor.c_str(), data->codename.c_str(), data->codename.c_str(), data->android_version, data->buildid.c_str(), data->vendordata.c_str());
std::vector<char> buf(size + 1);
(void) std::snprintf(buf.data(), buf.size(), fmt, data->vendor.c_str(), data->codename.c_str(), data->codename.c_str(), data->android_version, data->buildid.c_str(), data->vendordata.c_str());
return std::string(buf.begin(), buf.end());
}
static auto fromBuildDataToDesc(struct build_data *data)
{
const char *fmt = "%s-user %d %s %s release-keys";
const int size = std::snprintf(nullptr, 0, fmt, data->codename.c_str(), data->android_version, data->buildid.c_str(), data->vendordata.c_str());
std::vector<char> buf(size + 1);
(void) std::snprintf(buf.data(), buf.size(), fmt, data->codename.c_str(), data->android_version, data->buildid.c_str(), data->vendordata.c_str());
return std::string(buf.begin(), buf.end());
}
static auto serialize(const std::string& fpdata)
{
auto split = std::vector<std::string>{};
auto ss = std::stringstream{fpdata};
auto data = std::make_unique<struct build_data>();
for (std::string line; std::getline(ss, line, '/');) {
split.push_back(line);
}
// Fingerprint: "<VENDOR>/<CODENAME>/<CODENAME>:<AND_VER>/<BUILDID>/<VENDORDATA>:user/release-keys"
data->vendor = split[0];
std::string mixed = split[2];
auto idx = mixed.find(':');
data->codename = mixed.substr(0, idx);
data->android_version = stoi(mixed.substr(idx + 1));
data->buildid = split[3];
mixed = split[4];
idx = mixed.find(':');
data->vendordata = mixed.substr(0, idx);
return data;
}
static void apply(const std::string& path, const std::unique_ptr<struct build_data> data)
{
(void) std::remove(path.c_str());
std::ofstream file(path);
if (file.is_open()) {
std::string str;
file << "# Autogenerated by " << __FILE__ << std::endl;
file << "PRODUCT_GMS_CLIENTID_BASE := android-google" << std::endl;
file << std::endl;
str = fromBuildDataToFP(data.get());
str.resize(str.find('\0'));
file << "BUILD_FINGERPRINT := \"" << str << "\"" << std::endl;
file << std::endl;
file << "PRODUCT_BUILD_PROP_OVERRIDES += \\" << std::endl;
str = fromBuildDataToDesc(data.get());
str.resize(str.find('\0'));
file << "\tPRIVATE_BUILD_DESC=\"" << str << "\"" << std::endl;
file.close();
}
}
int main(int argc, const char **argv) {
CURL *curl = nullptr;
CURLcode res;
std::string readBuffer;
const std::string execDir = dirname(argv[0]);
curl = curl_easy_init();
if (curl != nullptr) {
curl_easy_setopt(curl, CURLOPT_URL, UPSTREAM_URL);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &readBuffer);
res = curl_easy_perform(curl);
curl_easy_cleanup(curl);
if (res != 0u) {
return res;
}
}
auto parseRes = parseJavaFile(readBuffer);
if (!parseRes->vaild) {
parseRes.reset();
return 1;
}
auto build = std::move(serialize(parseRes->data));
parseRes.reset();
apply(execDir + "/../fingerprint.mk", std::move(build));
return 0;
}

View file

@ -1,13 +0,0 @@
#!/bin/bash
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
sudo apt update
sudo apt install -y libcurl4-openssl-dev clang
cd universal7885-common/host-tools/
clang++ BuildFpUpdater.cc -o updater -lcurl
./updater
git add ..
git commit -m "universal7885: Update fp [`date`]"
git push

View file

@ -3,15 +3,12 @@ ifeq ($(TARGET_LOCAL_ARCH),arm64)
$(call inherit-product, vendor/samsung/universal7885-common/universal7885-common-vendor.mk)
endif
# Build Fingerprints
$(call inherit-product, $(LOCAL_PATH)/fingerprint.mk)
# Client Id base
PRODUCT_GMS_CLIENTID_BASE := android-samsung
# Allow Copying of apks.
PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true
# Derp
USE_LEGACY_BOOTANIMATION := true
# Disable Postrender Cleanup
TARGET_DISABLE_POSTRENDER_CLEANUP := true