diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
| commit | 60e5a34630c69e575f157a2babac70048cc3bdb1 (patch) | |
| tree | 9691d92caa5fba82bf307cf2af3374c616053bb8 /camera/Android.mk | |
| parent | 8d57bd027ab7f354e1707510d3ba5654ba16c0aa (diff) | |
| parent | 02a3b7b2c85b056f6172668ac9d2008a941a6df5 (diff) | |
| download | device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.gz device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.bz2 device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.zip | |
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
Conflicts:
BoardCommonConfig.mk
camera/Android.mk
common.mk
configs/80cfw
lpm.rc
overlay/frameworks/base/core/res/res/values/config.xml
overlay/packages/apps/Camera2/res/values/config.xml
Diffstat (limited to 'camera/Android.mk')
| -rw-r--r-- | camera/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index e4a6278..60bd5d7 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -12,6 +12,9 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +ifneq ($(filter i9300 i9305 n7100 t0lte t0lteatt t0ltetmo i605 l900 r950,$(TARGET_DEVICE)),) LOCAL_PATH := $(call my-dir) @@ -29,6 +32,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include \ + system/media/camera/include \ hardware/samsung/exynos4/hal/include LOCAL_CFLAGS += -DEXYNOS_ION @@ -41,3 +45,5 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) + +endif |