diff options
| author | loosethisskin <loosethisskin@gmail.com> | 2014-06-05 17:58:51 -0400 |
|---|---|---|
| committer | Hashcode <hashcode0f@gmail.com> | 2015-02-03 13:48:42 -0800 |
| commit | b198b68d879202716945bf372944dfd9e17bd421 (patch) | |
| tree | 0a2d13cee5b2a2ac73144f2ee460e04eb3f21ed0 | |
| parent | eda78f45b48d59f0003f7833dc47201495c8e716 (diff) | |
| download | hardware_ti_omap4-b198b68d879202716945bf372944dfd9e17bd421.zip hardware_ti_omap4-b198b68d879202716945bf372944dfd9e17bd421.tar.gz hardware_ti_omap4-b198b68d879202716945bf372944dfd9e17bd421.tar.bz2 | |
camera: libexif is now libjhead
Fixes undefined reference errors when building jem on 4.4.3.
See also https://github.com/CyanogenMod/android_hardware_ti_omap4xxx/commit/0fbe7ecfb0a526c02b774208fa00e0cba19d13a4
[hashcode0f@gmail.com: re-added libexif with PLATFORM var checks so repo can be used to build 4.4.x still]
Signed-off-by: Hashcode <hashcode0f@gmail.com>
Change-Id: I51ec616010228ae2c9217f47b9a6a243e5b20b3f
| -rwxr-xr-x | camera/Android.mk | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index 1978dc8..c5bf818 100755 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -125,8 +125,22 @@ TI_CAMERAHAL_COMMON_SHARED_LIBRARIES := \ libtiutils \ libcamera_client \ libgui \ - libjpeg \ + libjpeg + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 19 || echo 1),) +# add any 4.4.x versions of Android which use libjhead here +# currently only 4.4.3 +ifneq ($(filter 4.4.3,$(PLATFORM_VERSION)),) +TI_CAMERAHAL_COMMON_SHARED_LIBRARIES += \ + libjhead +else +TI_CAMERAHAL_COMMON_SHARED_LIBRARIES += \ libexif +endif +else +TI_CAMERAHAL_COMMON_SHARED_LIBRARIES += \ + libexif +endif ifdef ANDROID_API_JB_MR1_OR_LATER TI_CAMERAHAL_COMMON_SHARED_LIBRARIES += \ |