Skip to content

Commit

Permalink
samsung: Run bpfix
Browse files Browse the repository at this point in the history
Change-Id: Ic7f98ed28a7b42e70c62768a9a1672544893a970
  • Loading branch information
bgcngm committed Dec 30, 2024
1 parent f7b6bc1 commit 9fbc3a3
Show file tree
Hide file tree
Showing 11 changed files with 90 additions and 77 deletions.
5 changes: 4 additions & 1 deletion aidl/camera/common/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ cc_library_static {
],
include_dirs: ["system/media/private/camera/include"],
header_libs: ["libhardware_headers.camera3_samsung"],
export_include_dirs: ["include", "include_samsung"],
export_include_dirs: [
"include",
"include_samsung",
],
export_shared_lib_headers: ["libui"],
}

Expand Down
2 changes: 1 addition & 1 deletion aidl/camera/provider/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cc_defaults {
name: "camera_service_aidl_defaults.samsung",
defaults: [
"extra_id_defaults",
"samsung_camera3_defaults"
"samsung_camera3_defaults",
],
vintf_fragments: ["android.hardware.camera.provider-service.samsung.xml"],
vendor: true,
Expand Down
126 changes: 63 additions & 63 deletions aidl/thermal/Android.bp
Original file line number Diff line number Diff line change
@@ -1,71 +1,71 @@
cc_binary {
name: "android.hardware.thermal-service.samsung",
srcs: [
"service.cpp",
"Thermal.cpp",
"thermal-helper.cpp",
"utils/thermal_throttling.cpp",
"utils/thermal_info.cpp",
"utils/thermal_files.cpp",
"utils/power_files.cpp",
"utils/powerhal_helper.cpp",
"utils/thermal_watcher.cpp",
],
vendor: true,
relative_install_path: "hw",
vintf_fragments: [
"android.hardware.thermal-service.samsung.xml"
],
init_rc: [
"android.hardware.thermal-service.samsung.rc",
],
shared_libs: [
"libbase",
"libcutils",
"libjsoncpp",
"libutils",
"libnl",
"libbinder_ndk",
"android.hardware.power-V1-ndk",
"android.hardware.thermal-V1-ndk",
"pixel-power-ext-V1-ndk",
],
static_libs: [
"libpixelstats",
],
cflags: [
"-Wall",
"-Werror",
"-Wextra",
"-Wunused",
],
tidy: true,
tidy_checks: [
"android-*",
"cert-*",
"clang-analyzer-security*",
],
tidy_checks_as_errors: [
"android-*",
"clang-analyzer-security*",
"cert-*",
],
name: "android.hardware.thermal-service.samsung",
srcs: [
"service.cpp",
"Thermal.cpp",
"thermal-helper.cpp",
"utils/thermal_throttling.cpp",
"utils/thermal_info.cpp",
"utils/thermal_files.cpp",
"utils/power_files.cpp",
"utils/powerhal_helper.cpp",
"utils/thermal_watcher.cpp",
],
vendor: true,
relative_install_path: "hw",
vintf_fragments: [
"android.hardware.thermal-service.samsung.xml",
],
init_rc: [
"android.hardware.thermal-service.samsung.rc",
],
shared_libs: [
"libbase",
"libcutils",
"libjsoncpp",
"libutils",
"libnl",
"libbinder_ndk",
"android.hardware.power-V1-ndk",
"android.hardware.thermal-V1-ndk",
"pixel-power-ext-V1-ndk",
],
static_libs: [
"libpixelstats",
],
cflags: [
"-Wall",
"-Werror",
"-Wextra",
"-Wunused",
],
tidy: true,
tidy_checks: [
"android-*",
"cert-*",
"clang-analyzer-security*",
],
tidy_checks_as_errors: [
"android-*",
"clang-analyzer-security*",
"cert-*",
],
}

sh_binary {
name: "thermal_logd.samsung",
src: "init.thermal.logging.sh",
vendor: true,
init_rc: [
"samsung-thermal-logd.rc",
],
name: "thermal_logd.samsung",
src: "init.thermal.logging.sh",
vendor: true,
init_rc: [
"samsung-thermal-logd.rc",
],
}

sh_binary {
name: "thermal_symlinks.samsung",
src: "init.thermal.symlinks.sh",
vendor: true,
init_rc: [
"samsung-thermal-symlinks.rc",
],
name: "thermal_symlinks.samsung",
src: "init.thermal.symlinks.sh",
vendor: true,
init_rc: [
"samsung-thermal-symlinks.rc",
],
}
2 changes: 1 addition & 1 deletion aidl/usb/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ cc_binary {
"android.hardware.usb-V1-ndk",
"libbase",
"libbinder_ndk",
"libcutils",
"libcutils",
"liblog",
"libutils",
],
Expand Down
10 changes: 8 additions & 2 deletions aidl/usb/gadget/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,14 @@ cc_binary {
"android.hardware.usb.gadget-service.samsung.xml",
],
vendor: true,
srcs: ["service_gadget.cpp", "UsbGadget.cpp"],
cflags: ["-Wall", "-Werror"],
srcs: [
"service_gadget.cpp",
"UsbGadget.cpp",
],
cflags: [
"-Wall",
"-Werror",
],
shared_libs: [
"libbase",
"liblog",
Expand Down
2 changes: 1 addition & 1 deletion fingerprint/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cc_library_static {
name: "libudfps_extension.samsung",
srcs: ["UdfpsExtension.cpp"],
include_dirs: [
"frameworks/native/services/surfaceflinger/CompositionEngine/include"
"frameworks/native/services/surfaceflinger/CompositionEngine/include",
],
header_libs: [
"generated_kernel_headers",
Expand Down
3 changes: 1 addition & 2 deletions hidl/camera/provider/2.4/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ cc_library_shared {
header_libs: [
"[email protected]_headers",
"[email protected]_headers",
"libhardware_headers.camera3_samsung"
"libhardware_headers.camera3_samsung",
],
export_include_dirs: ["."],
}

4 changes: 2 additions & 2 deletions hidl/camera/provider/2.5/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ cc_library_shared {
header_libs: [
"[email protected]_headers",
"[email protected]_headers",
"libhardware_headers.camera3_samsung"
"libhardware_headers.camera3_samsung",
],
export_include_dirs: ["."],
}
Expand Down Expand Up @@ -76,7 +76,7 @@ cc_defaults {
header_libs: [
"[email protected]_headers",
"[email protected]_headers",
"libhardware_headers.camera3_samsung"
"libhardware_headers.camera3_samsung",
],
}

Expand Down
2 changes: 1 addition & 1 deletion hidl/touch/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cc_binary {
"KeyDisabler.cpp",
"StylusMode.cpp",
"TouchscreenGesture.cpp",
"service.cpp"
"service.cpp",
],
shared_libs: [
"libbase",
Expand Down
5 changes: 4 additions & 1 deletion hidl/vibrator/haptic/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ cc_binary {
vendor: true,
relative_install_path: "hw",
init_rc: ["[email protected]"],
srcs: ["service.cpp", "Vibrator.cpp"],
srcs: [
"service.cpp",
"Vibrator.cpp",
],
shared_libs: [
"libbase",
"libhidlbase",
Expand Down
6 changes: 4 additions & 2 deletions rebalance_interrupts/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ cc_binary {
name: "rebalance_interrupts-samsung",
init_rc: ["rebalance_interrupts-samsung.rc"],
srcs: ["rebalance_interrupts.cpp"],
shared_libs: ["libbase",
"liblog",],
shared_libs: [
"libbase",
"liblog",
],
proprietary: true,
}

0 comments on commit 9fbc3a3

Please sign in to comment.