aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2017-12-06 11:52:04 -0800
committerXin Li <delphij@google.com>2017-12-06 14:24:51 -0800
commitfabbb665d0e0aa1c4286acd423cc1e572d10d684 (patch)
tree66474bc54ab1b8b7a998d00f8af6bca432b038a6
parent58f53abcc3314890c4994c0f00f828500b3e1d77 (diff)
parent36fdd63f091badfcfdc5b1f4ebaf914e2057af21 (diff)
downloadpsb_video-fabbb665d0e0aa1c4286acd423cc1e572d10d684.tar.gz
DO NOT MERGE: Merge Oreo MR1 into masterHEADandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1oreo-mr1-iot-releaseoreo-mr1-1.2-iot-releaseo-mr1-iot-preview-8o-mr1-iot-preview-7nougat-iot-releasemastermain
Exempt-From-Owner-Approval: Changes already landed internally Change-Id: I0a31d2578a1cf8fdee902176bf25d9fa0342d74a
-rw-r--r--src/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Android.mk b/src/Android.mk
index caa041b..628bd19 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -22,6 +22,8 @@
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
+ifeq ($(ENABLE_IMG_GRAPHICS),true)
+
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -179,3 +181,5 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := pvr_drv_video
include $(BUILD_SHARED_LIBRARY)
+
+endif # ($(ENABLE_IMG_GRAPHICS),true)