diff options
| author | Michael Gernoth <michael@gernoth.net> | 2014-11-11 00:49:18 +0100 |
|---|---|---|
| committer | Hashcode <hashcode0f@gmail.com> | 2015-02-03 13:49:09 -0800 |
| commit | e62d3a9f34e9527c5ecc014c78ee44d2833f3d47 (patch) | |
| tree | 474c388bd738af3dfac2f301035080bc7df8e4ec | |
| parent | 83940b01cd52352081b838af6461004f7757491a (diff) | |
| download | hardware_ti_omap4-e62d3a9f34e9527c5ecc014c78ee44d2833f3d47.zip hardware_ti_omap4-e62d3a9f34e9527c5ecc014c78ee44d2833f3d47.tar.gz hardware_ti_omap4-e62d3a9f34e9527c5ecc014c78ee44d2833f3d47.tar.bz2 | |
camera: link against libjhead on 5.0+
Change-Id: If682f40ca99dc13a1243cb391422d98803914a72
Signed-off-by: Michael Scott <michael.scott@linaro.org>
Conflicts:
camera/Android.mk
| -rwxr-xr-x | camera/Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index a37f0f3..a11c728 100755 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -128,9 +128,12 @@ TI_CAMERAHAL_COMMON_SHARED_LIBRARIES := \ libjpeg ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 19 || echo 1),) -# add any 4.4.x versions of Android which use libjhead here +# check for 5.0 and greater +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 21 || echo 1),) +TI_CAMERAHAL_COMMON_SHARED_LIBRARIES += \ + libjhead # currently 4.4.3 and 4.4.4 -ifneq ($(filter 4.4.3 4.4.4,$(PLATFORM_VERSION)),) +else ifneq ($(filter 4.4.3 4.4.4,$(PLATFORM_VERSION)),) TI_CAMERAHAL_COMMON_SHARED_LIBRARIES += \ libjhead else |