diff options
| author | Danny Baumann <dannybaumann@web.de> | 2015-03-03 10:44:52 +0100 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2016-12-30 17:21:19 +0200 |
| commit | f9696408c977c55ce7f7d6b7a0738d2af834eab5 (patch) | |
| tree | 7a93a447bfae5da5202801b421d19c6b379a4565 /Android.mk | |
| parent | 99d69dadd01ca044d5e4851707f18e1fe00ee624 (diff) | |
| download | android_packages_apps_Camera2-f9696408c977c55ce7f7d6b7a0738d2af834eab5.tar.gz android_packages_apps_Camera2-f9696408c977c55ce7f7d6b7a0738d2af834eab5.tar.bz2 android_packages_apps_Camera2-f9696408c977c55ce7f7d6b7a0738d2af834eab5.zip | |
Introduce a 'device plugin' concept.
It allows device specific code to work with the camera while it's
active.
Change-Id: Iec78bf4d632c71f02e830eb2ac05504370bba660
camera2: Fix NPE
* These values will be NULL when permissions haven't been accepted.
Change-Id: I078deab9f7eff76f3d01087e2df7ff2f2a3c717d
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 6deaffd48..a6b24bc59 100644 --- a/Android.mk +++ b/Android.mk @@ -15,6 +15,12 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES += $(call all-java-files-under, src_pd) LOCAL_SRC_FILES += $(call all-java-files-under, src_pd_gcam) +ifneq ($(BOARD_CAMERA_PLUGIN),) + LOCAL_SRC_FILES += $(call all-java-files-under, ../../../$(BOARD_CAMERA_PLUGIN)) +else + LOCAL_SRC_FILES += $(call all-java-files-under, src_plugin) +endif + LOCAL_RESOURCE_DIR += \ $(LOCAL_PATH)/res \ $(LOCAL_PATH)/res_p |