From 038776e7ff83ee90b9c8a5f24318889c80e757d7 Mon Sep 17 00:00:00 2001 From: Hinix Date: Thu, 27 Mar 2025 17:04:48 +0800 Subject: [PATCH] remove agent duplicate property --- aosp/build/make/tools/buildinfo.sh | 3 +-- aosp/system/core/init/property_service.cpp | 2 ++ aosp/vendor/isula/properties.mk | 9 --------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/aosp/build/make/tools/buildinfo.sh b/aosp/build/make/tools/buildinfo.sh index 6f593d15a..ff3cf56bc 100644 --- a/aosp/build/make/tools/buildinfo.sh +++ b/aosp/build/make/tools/buildinfo.sh @@ -6,9 +6,8 @@ echo "# autogenerated by buildinfo.sh" # The ro.build.id will be set dynamically by init, by appending the unique vbmeta digest. if [ "$BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT" = "true" ] ; then echo "ro.build.legacy.id=$BUILD_ID" -else - echo "ro.build.id?=$BUILD_ID" fi + echo "ro.build.display.id?=$BUILD_DISPLAY_ID" echo "ro.build.version.incremental=$BUILD_NUMBER" echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION" diff --git a/aosp/system/core/init/property_service.cpp b/aosp/system/core/init/property_service.cpp index e6b952bc5..d397b340c 100644 --- a/aosp/system/core/init/property_service.cpp +++ b/aosp/system/core/init/property_service.cpp @@ -956,6 +956,8 @@ static void property_initialize_ro_product_props() { } static void property_initialize_build_id() { + // config ro.build.id with agent + return; std::string build_id = GetProperty(ID_PROP, ""); if (!build_id.empty()) { return; diff --git a/aosp/vendor/isula/properties.mk b/aosp/vendor/isula/properties.mk index 4d9b8d89a..81725c1f0 100644 --- a/aosp/vendor/isula/properties.mk +++ b/aosp/vendor/isula/properties.mk @@ -56,15 +56,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.hardware.vulkan=default \ ro.opengles.version=196610 \ - -# display -PRODUCT_PROPERTY_OVERRIDES += \ - ro.hardware.fps=30 \ - ro.hardware.height=1920 \ - ro.hardware.width=1080 \ - ro.sf.lcd_density=440 \ - - # simulate PRODUCT_PROPERTY_OVERRIDES += \ ro.hardware=$(BUILD_HARDWARE) \ -- Gitee