1
git diff
diff --git a/droid-hal-device.inc b/droid-hal-device.inc
index 1a8ec95..75b6e02 100644
--- a/droid-hal-device.inc
+++ b/droid-hal-device.inc
@@ -207,6 +207,8 @@ BuildRequires: oneshot
BuildRequires: pkgconfig(systemd)
BuildRequires: qt5-qttools-kmap2qmap >= 5.1.0+git5
BuildRequires: rsync
+#starting from android 8
+BuildRequires: python
%{?custom_build_requires}
Requires(pre): droid-hal-%{rpm_device}-users
Requires: droid-hal-%{rpm_device}-users
@@ -470,7 +472,7 @@ mkdir tmp
echo Verifying kernel config
# AOSP seems to use .../obj/kernel/.config not obj/KERNEL_OBJ/.config like CM : so wildcard it
hybris/mer-kernel-check/mer_verify_kernel_config \
- %{android_root}/out/target/product/%{device}/obj/*/.config
+ %{android_root}/out/target/product/%{device}/obj/KERNEL_OBJ/.config
if (grep -q string_value build/release/flag_values/*/RELEASE_PLATFORM_VERSION_LAST_STABLE.textproto); then
@@ -742,7 +744,7 @@ if [ $android_version_major -ge "10" ] && [ $android_version_major -le "14" ]; t
apex_path=apex/com.android.runtime.release/android_common_com.android.runtime.release/image.apex
if [ ! -f "$art_path/$apex_path/lib/bionic/libc.so" ]; then
art_path=%{android_root}/out/target/product/%{device}/system
- apex_path=apex/com.android.runtime.release
+ apex_path=apex/com.android.runtime
fi
if [ ! -f "$art_path/$apex_path/lib/bionic/libc.so" ]; then
art_path=%{android_root}/out/target/product/%{device}
@@ -875,7 +877,8 @@ mv $hdrs/android-headers.pc $RPM_BUILD_ROOT%{dhdlibdir}/pkgconfig/
%endif
# If this ever becomes unmanageable then
-# grep -l dev/alog %%{android_root}/out/target/product/%{device}/system/lib/*
+# grep -l dev/alog %%{android_root}/
+/%{device}/system/lib/*
# libdsyscalls.so and libc.so are blacklisted
ln -s ../system/lib/{liblog.so,libcutils.so} $RPM_BUILD_ROOT%{_libexecdir}/droid-hybris/lib-dev-alog/.
%if 0%{?droid_target_aarch64:1}
@@ -1012,10 +1015,10 @@ fi
# Kernel and module installation; to
# /boot and modules to /lib as normal
-kernel_release=$(sort -u out/target/product/%{device}/*/*/include/config/kernel.release)
-cp out/target/product/%{device}/kernel $RPM_BUILD_ROOT/boot/kernel-$kernel_release
+#kernel_release=$(sort -u out/target/product/%{device}/*/*/include/config/kernel.release)
+#cp out/target/product/%{device}/kernel $RPM_BUILD_ROOT/boot/kernel-$kernel_release
-echo "/boot/kernel-$kernel_release" > kernel.files
+#echo "/boot/kernel-$kernel_release" > kernel.files
if cp out/target/product/%{device}/obj/ROOT/hybris-boot_intermediates/boot-initramfs.gz $RPM_BUILD_ROOT/boot/ &> /dev/null; then
echo "/boot/boot-initramfs.gz" >> kernel.files
(END)For immediate assistance, please email our customer support: [email protected]