blob: 6220128f5a577675bd7a681babdeb654f94989ec [file] [log] [blame]
drops {
android_build_drop {
<<<<<<< HEAD (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
build_id: "7047867"
=======
build_id: "7079318"
>>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
target: "kernel_sunfish_khwasan"
source_file: "swr_ctrl_dlkm.ko"
}
dest_file: "khwasan/swr_ctrl_dlkm.ko"
<<<<<<< HEAD (bea74e Snap for 7050341 from d77e70edbaab4efebc97527634437e1d7d2d00)
version: "Linux version 4.14.199-g3c46b19f0bc4-ab7047867 (android-build@abfarm-east4-079) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Dec 23 06:38:48 UTC 2020"
=======
version: "Linux version 4.14.199-g1823ff3e1553-ab7079318 (android-build@abfarm-us-west1-c-0039) (Android (6443078 based on r383902) clang version 11.0.1 (https://android.googlesource.com/toolchain/llvm-project b397f81060ce6d701042b782172ed13bee898b79)) #1 SMP PREEMPT Wed Jan 13 10:30:11 UTC 2021"
>>>>>>> CHANGE (98f4e8 sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ])
version_group: "kernel-and-modules"
git_project: "device/google/sunfish-kernel"
}