commit 62322ddc131b362e82e1e9352db642a715dd2de6
author android-build-team Robot <android-build-team-robot@google.com> Sun May 20 07:21:49 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun May 20 07:21:49 2018 +0000
tree 49ed347ac6332dcac24f8e8381b5b0bce614081f
parent 4e1a9e41fd6d87aa74e6ad2c8741bf5ad094db6c
parent 524c9287a1cd510dc134384024238ff7d2a3b267

Snap for 4793185 from 524c9287a1cd510dc134384024238ff7d2a3b267 to pi-release

Change-Id: I1f83f7f828aafb195a57e093385289d36a2dfd20

Android.mk

diff --git a/Android.mk b/Android.mk
index 1d1920f..f716b2a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,12 +2,16 @@
 
 #Compile these for all targets under QCOM_BOARD_PLATFORMS list.
 ifeq ($(call is-board-platform-in-list, $(QCOM_BOARD_PLATFORMS)),true)
+ifneq ($(BUILD_WITHOUT_VENDOR),true)
 include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk
 include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk
 endif
+endif
 
 ifeq ($(call is-board-platform-in-list, $(MSM_VIDC_TARGET_LIST)),true)
+ifneq ($(BUILD_WITHOUT_VENDOR),true)
 include $(QCOM_MEDIA_ROOT)/libplatformconfig/Android.mk
 include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk
 include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk
 endif
+endif