From e4ae19652aabdcf5de5b0c74c47a3795eaac9b77 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Thu, 5 May 2011 15:05:14 -0700 Subject: disable libcamera and libs3cjpeg --- aries/libcamera/Android.mk | 3 +++ aries/libs3cjpeg/Android.mk | 2 ++ 2 files changed, 5 insertions(+) diff --git a/aries/libcamera/Android.mk b/aries/libcamera/Android.mk index c069daf..f4b41bb 100644 --- a/aries/libcamera/Android.mk +++ b/aries/libcamera/Android.mk @@ -1,3 +1,5 @@ +ifeq ($(Y_U_NO_HAVE_CAMERA),true) + # When zero we link against libqcamera; when 1, we dlopen libqcamera. ifeq ($(BOARD_CAMERA_LIBRARIES),libcamera) @@ -46,3 +48,4 @@ LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) endif +endif diff --git a/aries/libs3cjpeg/Android.mk b/aries/libs3cjpeg/Android.mk index b61c433..7a1acd6 100644 --- a/aries/libs3cjpeg/Android.mk +++ b/aries/libs3cjpeg/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(Y_U_NO_HAVE_CAMERA),true) # Copyright (C) 2008 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,3 +33,4 @@ LOCAL_MODULE_TAGS := optional LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) +endif -- cgit v1.1