droidmedia

--- rpm/dhd/helpers/droidmedia-localbuild.spec  2018-03-24 13:49:29.196700149 +0000
+++ /home/del/hadk/external/droidmedia/rpm/droidmedia.spec      2018-03-26 16:02:57.921331998 +0000
@@ -3,18 +3,18 @@
 %define __find_requires     %{nil}
 %global debug_package       %{nil}
 %define __provides_exclude_from ^.*$
-%define device_rpm_architecture_string armv7hl
+
 %define _target_cpu %{device_rpm_architecture_string}

 Name:          droidmedia
 Summary:       Android media wrapper library
-Version:       0.0.0
+Version:       0.20170214.0
 Release:       1
 Group:         System/Libraries
 License:       ASL 2.0
-#BuildRequires: ubu-trusty
-#BuildRequires: sudo-for-abuild
-#BuildRequires: droid-bin-src-full
+BuildRequires: ubu-trusty
+BuildRequires: sudo-for-abuild
+BuildRequires: droid-bin-src-full
 Source0:       %{name}-%{version}.tgz
 AutoReqProv:   no

@@ -23,7 +23,6 @@

 %package       devel
 Summary:       droidmedia development headers
-Group:         System/Libraries
 Requires:      droidmedia = %{version}-%{release}
 BuildArch:     noarch

@@ -37,26 +36,38 @@
 exit -1
 %endif

-%setup
+%setup -T -c -n droidmedia
+sudo chown -R abuild:abuild /home/abuild/src/droid/
+mv /home/abuild/src/droid/* .
+mkdir -p external
+pushd external
+tar -zxf %SOURCE0
+mv droidmedia* droidmedia
+popd
+
+cat /dev/null > external/droidmedia/env.mk
+
+%if %{?force_hal:1}%{!?force_hal:0}
+echo Forcing Camera HAL connect version %{force_hal}
+echo FORCE_HAL := %{force_hal} >> external/droidmedia/env.mk
+%endif

-#sudo chown -R abuild:abuild /home/abuild/src/droid/
-#mv /home/abuild/src/droid/* .
-#mkdir -p external
-#pushd external
-#tar -zxf %SOURCE0
-#mv droidmedia* droidmedia
-#popd
 %build
-pwd
-ls
-tar -xvf %name-%version.tgz
+
+if (grep -qi '^BOARD_QTI_CAMERA_32BIT_ONLY := true' device/*/*/*.mk) || %{?droidmedia_32bit:1}%{!?droidmedia_32bit:0}; then
+echo DROIDMEDIA_32 := true >> external/droidmedia/env.mk
+droid-make %{?_smp_mflags} libdroidmedia_32 minimediaservice minisfservice libminisf_32
+else
+droid-make %{?_smp_mflags} libdroidmedia minimediaservice minisfservice libminisf
+fi
+
 %install

 mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/droid-hybris/system/lib/
 mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/droid-hybris/system/bin/
 mkdir -p $RPM_BUILD_ROOT/%{_includedir}/droidmedia/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/droidmedia/
-pushd %name-%version
+
 cp out/target/product/*/system/lib/libdroidmedia.so \
     $RPM_BUILD_ROOT/%{_libexecdir}/droid-hybris/system/lib/

@@ -72,7 +83,6 @@
 cp external/droidmedia/*.h $RPM_BUILD_ROOT/%{_includedir}/droidmedia/
 cp external/droidmedia/hybris.c $RPM_BUILD_ROOT/%{_datadir}/droidmedia/

-popd
 %files
 %defattr(-,root,root,-)
 %{_libexecdir}/droid-hybris/system/lib/libdroidmedia.so
@@ -84,4 +94,3 @@
 %defattr(-,root,root,-)
 %{_includedir}/droidmedia/*.h
 %{_datadir}/droidmedia/hybris.c