diff options
| author | Will McVicker <willmcvicker@google.com> | 2022-04-14 12:46:16 -0700 |
|---|---|---|
| committer | Will McVicker <willmcvicker@google.com> | 2022-04-14 12:46:18 -0700 |
| commit | 5e11d86fe7d325b464b55e3fff0f652edf4c43ca (patch) | |
| tree | cf2a2d3c958490d8f38d3f76add1877de5e1f1b2 | |
| parent | ddc3c28349674f70ab7c20cae4a17e10a4ac6abb (diff) | |
| parent | bd4924f7b4402190aa20aa47ae14058f09652c3a (diff) | |
| download | reset-5e11d86fe7d325b464b55e3fff0f652edf4c43ca.tar.gz | |
Merge 'aosp/android-gs-raviole-mainline' into 'pa/android-gs-pixel-mainline'
* 'mirror-aosp-android-gs-raviole-mainline' of sso://partner-android/kernel/private/google-modules/power/reset:
kleaf: //build/kleaf -> //build/kernel/kleaf.
Update path for the SoC project
Update path for the SoC project
Update to support gs/kernel/device-modules as an external module
kleaf: Fix module paths for slider.
Kleaf: add power_reset kernel module.
Change-Id: If4c7acadd9c568fa7c6be6f3f0e49f9af3ddf7b2
Signed-off-by: Will McVicker <willmcvicker@google.com>
| -rw-r--r-- | BUILD.bazel | 14 | ||||
| -rw-r--r-- | Makefile | 7 |
2 files changed, 14 insertions, 7 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 3c29912..3da6d4a 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -6,25 +6,27 @@ # unless you have coordinated with the team managing the Soong to Bazel # migration. -load("//build/kleaf:kernel.bzl", "kernel_module") +load("//build/kernel/kleaf:kernel.bzl", "kernel_module") kernel_module( - name = "reset.cloudripper", + name = "reset.slider", srcs = glob([ "**/*.c", "**/*.h", "Kbuild", ]) + [ - "//private/google-modules/bms:headers", + "//gs/google-modules/bms:headers", + "//gs/google-modules/soc-modules:gs101_soc_headers", ], outs = [ "exynos-reboot.ko", ], - kernel_build = "//private/gs-google:cloudripper", + kernel_build = "//gs/google-modules/soc-modules:slider", kernel_module_deps = [ - "//private/google-modules/bms:bms.cloudripper", + "//gs/google-modules/bms:bms.slider", + "//gs/google-modules/soc-modules:gs101_soc", ], visibility = [ - "//private/gs-google:__pkg__", + "//gs/google-modules/soc-modules:__pkg__", ], ) @@ -3,5 +3,10 @@ M ?= $(shell pwd) KBUILD_OPTIONS += CONFIG_POWER_RESET_EXYNOS=m +EXTRA_SYMBOLS += $(OUT_DIR)/../gs/google-modules/bms/Module.symvers + +include $(KERNEL_SRC)/../gs/google-modules/soc-modules/Makefile.include + modules modules_install clean: - $(MAKE) -C $(KERNEL_SRC) M=$(M) $(KBUILD_OPTIONS) KBUILD_EXTRA_SYMBOLS=$(OUT_DIR)/../google-modules/bms/Module.symvers $(@) + $(MAKE) -C $(KERNEL_SRC) M=$(M) \ + $(KBUILD_OPTIONS) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" $(@) |