diff options
| author | Will McVicker <willmcvicker@google.com> | 2023-11-03 16:26:27 -0700 |
|---|---|---|
| committer | Will McVicker <willmcvicker@google.com> | 2024-04-15 16:45:14 -0700 |
| commit | 8e05581a19b021fc251e0f7553f2e4d48fe98cb2 (patch) | |
| tree | 289e6462749a8bb571e206ff49a5cc0a80702c35 | |
| parent | 2fb608ae6c16587ea08ab4b595138398bb7ecd61 (diff) | |
| download | common-android14-gs-pixel-6.1.tar.gz | |
Fix up the build to compile with UDCandroid14-gs-pixel-6.1
Change-Id: I984527087ba4bf453e0b0a20aaef80b3dd20c6a4
Signed-off-by: Will McVicker <willmcvicker@google.com>
| -rw-r--r-- | BUILD.bazel | 5 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | goog_touch_interface.c | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 54b14f7..789e9d0 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -13,12 +13,11 @@ filegroup( ) filegroup( - name = "touch.common.kconfig", + name = "common.kconfig", srcs = glob([ "Kconfig", ]), visibility = [ - "//private/devices/google:__subpackages__", "//private/google-modules/soc/gs:__pkg__", ], ) @@ -43,12 +42,12 @@ kernel_module( ], kernel_build = "//private/google-modules/soc/gs:gs_kernel_build", visibility = [ - "//private/devices/google:__subpackages__", "//private/google-modules/soc/gs:__pkg__", "//private/google-modules/touch:__subpackages__", ], deps = [ "//private/google-modules/aoc", + "//private/google-modules/display:samsung", "//private/google-modules/soc/gs:gs_soc_module", ], ) @@ -3,13 +3,13 @@ KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build M ?= $(shell pwd) -KBUILD_OPTIONS += CONFIG_TOUCHSCREEN_TBN=m -KBUILD_OPTIONS += CONFIG_TOUCHSCREEN_HEATMAP=m -KBUILD_OPTIONS += CONFIG_TOUCHSCREEN_OFFLOAD=m -KBUILD_OPTIONS += CONFIG_GOOG_TOUCH_INTERFACE=m +EXTRA_SYMBOLSâ–¸ += $(OUT_DIR)/../private/google-modules/display/Module.symvers EXTRA_CFLAGS += -DDYNAMIC_DEBUG_MODULE include $(KERNEL_SRC)/../private/google-modules/soc/gs/Makefile.include modules modules_install headers_install clean: - $(MAKE) -C $(KERNEL_SRC) M=$(M) $(KBUILD_OPTIONS) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" $(@) + $(MAKE) -C $(KERNEL_SRC) M=$(M) \ + EXTRA_CFLAGS="$(EXTRA_CFLAGS)" KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" $(@) + +modules_install: headers_install diff --git a/goog_touch_interface.c b/goog_touch_interface.c index 3bb1db5..ca3d2a7 100644 --- a/goog_touch_interface.c +++ b/goog_touch_interface.c @@ -12,10 +12,10 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <samsung/exynos_drm_connector.h> +#include <trace/hooks/systrace.h> #include "goog_touch_interface.h" #include "touch_bus_negotiator.h" -#include "../../../gs-google/drivers/soc/google/vh/kernel/systrace.h" static struct class *gti_class; static u8 gti_dev_num; @@ -2124,7 +2124,7 @@ void goog_update_fw_settings(struct goog_touch_interface *gti) static void goog_offload_set_running(struct goog_touch_interface *gti, bool running) { if (gti->offload.offload_running != running) { - GOOG_INFO(gti, "Set offload_running=%d, irq_index=%d, input_index=%d\n", + GOOG_INFO(gti, "Set offload_running=%d, irq_index=%llu, input_index=%llu\n", running, gti->irq_index, gti->input_index); gti->offload.offload_running = running; |