diff options
| author | Colin Cross <ccross@android.com> | 2014-03-24 19:36:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-24 19:36:36 +0000 |
| commit | 32ce52b01dab863f2b4749e1c69f619cf820486f (patch) | |
| tree | 489e255200d3a7bfdac8269bee29a9b55707f14e /services/camera/libcameraservice/Android.mk | |
| parent | f555c47f1843b5a3557e18c16cb06b0ec06dcf34 (diff) | |
| parent | 5c679d41714e42f153f6aeb492df54510a195bc1 (diff) | |
| download | frameworks_av-32ce52b01dab863f2b4749e1c69f619cf820486f.zip frameworks_av-32ce52b01dab863f2b4749e1c69f619cf820486f.tar.gz frameworks_av-32ce52b01dab863f2b4749e1c69f619cf820486f.tar.bz2 | |
am 5c679d41: resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp
* commit '5c679d41714e42f153f6aeb492df54510a195bc1':
libcameraservice: build 64-bit
libcameraservice: fix 64-bit print format warnings
Diffstat (limited to 'services/camera/libcameraservice/Android.mk')
| -rw-r--r-- | services/camera/libcameraservice/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Android.mk b/services/camera/libcameraservice/Android.mk index 4e2272d..2f485b9 100644 --- a/services/camera/libcameraservice/Android.mk +++ b/services/camera/libcameraservice/Android.mk @@ -74,6 +74,5 @@ LOCAL_C_INCLUDES += \ LOCAL_CFLAGS += -Wall -Wextra LOCAL_MODULE:= libcameraservice -LOCAL_32_BIT_ONLY := true include $(BUILD_SHARED_LIBRARY) |