From aa75d8dbca9940f628fff75697c1b2a4a4bfe313 Mon Sep 17 00:00:00 2001 From: Mashopy Date: Sat, 5 Apr 2025 04:20:13 +0200 Subject: [PATCH] samsung: Run bpfix Change-Id: Ida4dd24167f0f15b1e67a3ae3f73454caa4e1f6e --- AdvancedDisplay/Android.bp | 2 +- aidl/camera/common/Android.bp | 2 +- doze/Android.bp | 1 - hidl/keymaster/Android.bp | 2 +- hidl/livedisplay/Android.bp | 8 ++++---- hidl/touch/Android.bp | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/AdvancedDisplay/Android.bp b/AdvancedDisplay/Android.bp index 455692a..0b08da1 100644 --- a/AdvancedDisplay/Android.bp +++ b/AdvancedDisplay/Android.bp @@ -8,7 +8,7 @@ android_app { name: "AdvancedDisplay", srcs: ["src/**/*.java"], - resource_dirs: ["res"], + certificate: "platform", platform_apis: true, diff --git a/aidl/camera/common/Android.bp b/aidl/camera/common/Android.bp index 56c4683..c22d930 100644 --- a/aidl/camera/common/Android.bp +++ b/aidl/camera/common/Android.bp @@ -1,10 +1,10 @@ cc_library_static { name: "android.hardware.camera.common-helper.samsung", - vendor_available: true, defaults: [ "hidl_defaults", "samsung_camera3_defaults", ], + vendor_available: true, srcs: [ "CameraModule.cpp", "CameraMetadata.cpp", diff --git a/doze/Android.bp b/doze/Android.bp index a719893..46ae0eb 100644 --- a/doze/Android.bp +++ b/doze/Android.bp @@ -9,7 +9,6 @@ android_app { defaults: ["SettingsLibDefaults"], srcs: ["src/**/*.java"], - resource_dirs: ["res"], certificate: "platform", platform_apis: true, diff --git a/hidl/keymaster/Android.bp b/hidl/keymaster/Android.bp index bd92534..29fe15e 100644 --- a/hidl/keymaster/Android.bp +++ b/hidl/keymaster/Android.bp @@ -19,7 +19,7 @@ cc_binary { "libutils", ] + select(soong_config_variable("samsungVars", "target_keymaster4_library"), { // link before libkeymaster4 to allow injecting custom libcrypto - any @ flag_val: [ flag_val ], + any @ flag_val: [flag_val], default: [], }) + [ "libkeymaster4", diff --git a/hidl/livedisplay/Android.bp b/hidl/livedisplay/Android.bp index 5cd1680..2e83364 100644 --- a/hidl/livedisplay/Android.bp +++ b/hidl/livedisplay/Android.bp @@ -56,28 +56,28 @@ cc_defaults { cc_binary { name: "lineage.livedisplay@2.0-service.samsung-exynos", - init_rc: ["lineage.livedisplay@2.0-service.samsung-exynos.rc"], defaults: ["livedisplay_samsung_exynos_defaults"], + init_rc: ["lineage.livedisplay@2.0-service.samsung-exynos.rc"], cflags: ["-DLIVES_IN_SYSTEM"], } cc_binary { name: "vendor.lineage.livedisplay@2.0-service.samsung-exynos", - init_rc: ["vendor.lineage.livedisplay@2.0-service.samsung-exynos.rc"], defaults: ["livedisplay_samsung_exynos_defaults"], + init_rc: ["vendor.lineage.livedisplay@2.0-service.samsung-exynos.rc"], vendor: true, } cc_binary { name: "lineage.livedisplay@2.0-service.samsung-qcom", - init_rc: ["lineage.livedisplay@2.0-service.samsung-qcom.rc"], defaults: ["livedisplay_samsung_qcom_defaults"], + init_rc: ["lineage.livedisplay@2.0-service.samsung-qcom.rc"], cflags: ["-DLIVES_IN_SYSTEM"], } cc_binary { name: "vendor.lineage.livedisplay@2.0-service.samsung-qcom", - init_rc: ["vendor.lineage.livedisplay@2.0-service.samsung-qcom.rc"], defaults: ["livedisplay_samsung_qcom_defaults"], + init_rc: ["vendor.lineage.livedisplay@2.0-service.samsung-qcom.rc"], vendor: true, } diff --git a/hidl/touch/Android.bp b/hidl/touch/Android.bp index a16cf57..1d25294 100644 --- a/hidl/touch/Android.bp +++ b/hidl/touch/Android.bp @@ -14,8 +14,8 @@ cc_binary { name: "vendor.lineage.touch@1.0-service.samsung", - init_rc: ["vendor.lineage.touch@1.0-service.samsung.rc"], defaults: ["samsung_header_path_defaults"], + init_rc: ["vendor.lineage.touch@1.0-service.samsung.rc"], relative_install_path: "hw", // FIXME: this should be 'vendor: true' for modules that will eventually be // on AOSP.