Fixes for building with sony_aosp_11 #335
Conversation
moralrecordings
force-pushed
the
sony_aosp_11_fixes
branch
from
6bcf406 to
78d1ddc
Compare
| # Find the kernel build directory. | ||
| # AOSP seems to use .../obj/kernel/.config not obj/KERNEL_OBJ/.config like CM. | ||
| # Sony AOSP 11 uses a separate storage area. | ||
| if [[ -f %{android_root}/out/target/product/%{device}/obj/KERNEL_OBJ/.config ]]; then |
| # AOSP seems to use .../obj/kernel/.config not obj/KERNEL_OBJ/.config like CM. | ||
| # Sony AOSP 11 uses a separate storage area. | ||
| if [[ -f %{android_root}/out/target/product/%{device}/obj/KERNEL_OBJ/.config ]]; then | ||
| KERNEL_PATH=%{android_root}/out/target/product/%{device}/obj/KERNEL_OBJ/ |
There was a problem hiding this comment.
Don't caps the variable unless it is a environment variable.
| @@ -535,6 +546,20 @@ android_version_major=$(awk '/PLATFORM_VERSION([A-Z0-9.]*|_LAST_STABLE) := ([0-9 | |||
| < %{android_root}/build/core/version_defaults.mk \ | |||
| | awk -F'.' '{print $1}') | |||
|
|
|||
| # Find the kernel build directory. | |||
| # AOSP seems to use .../obj/kernel/.config not obj/KERNEL_OBJ/.config like CM. | |||
| # Sony AOSP 11 uses a separate storage area. | |||
There was a problem hiding this comment.
There isn't really a standard for these as you are not supposed to be build the kernel inside the Android build system.
Also the comment about CM is out of date as there's no CM anymore
|
@moralrecordings Please try #336 instead. |
|
#336 is definitely the better approach, but is missing the check for The cheap option would be to move the search up to |
That's the default path you should use -O to the regular path or create a PR to change the default.You can do so like this: |
out/clang.sh/kernel-tmp-(device). These are required byrpm/dhd/helpers/build_packages.sh --droid-hal. As the existing wildcard couldn't be modified easily to include such a different location, I replaced it with some conditionals and an exit statement on failure. The code now stores it in a shell variable KERNEL_PATH; I wasn't able to find a way to persist this between%buildand%install, so I had to duplicate it. I'm not an RPM expert, so I'd welcome any advice.