diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -1,7 +1,14 @@ # TODO: Find a better way to separate build configs for ADP vs non-ADP devices ifneq ($(TARGET_BOARD_AUTO),true) - QCOM_MEDIA_ROOT := $(call my-dir) - ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) + # for msm8996 targets, use the msm8996 directory, for all other targets + # use the msm8974 directory. + ifneq ($(filter msm8996, $(TARGET_BOARD_PLATFORM)),) + QCOM_MEDIA_ROOT := $(call my-dir)/msm8996 + else + QCOM_MEDIA_ROOT := $(call my-dir)/msm8974 + endif + + ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf msm8084 msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk endif @@ -10,11 +17,11 @@ ifneq ($(TARGET_BOARD_AUTO),true) include $(QCOM_MEDIA_ROOT)/mm-video-legacy/Android.mk endif - ifneq ($(filter msm8610 msm8226 msm8974 msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) + ifneq ($(filter msm8610 msm8226 msm8974 msm8084 msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk endif - ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) + ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8084 msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),) include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk endif endif |