diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-01-16 23:08:12 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-01-16 23:08:12 +0000 |
| commit | 2eabb94e485218dff0ea023eebb82179057036ba (patch) | |
| tree | 2e633dfea0fe116dd4096e0d5af54917d4bade58 | |
| parent | 403aaf09bf90b1e40c557b0c7d4ead3eff3da0d0 (diff) | |
| download | android_hardware_qcom_media-2eabb94e485218dff0ea023eebb82179057036ba.tar.gz android_hardware_qcom_media-2eabb94e485218dff0ea023eebb82179057036ba.tar.bz2 android_hardware_qcom_media-2eabb94e485218dff0ea023eebb82179057036ba.zip | |
Fix the header-inclusion paths for non-AOSP A and B-family targets
AOSP chose to use specific platform names to split the A/B-family
implementations of the display HALs, but we support other platforms
within the same families. Add support for those.
Change-Id: I8a4b9164e04e0fb7128216e56f76b4d96fc1868c
| -rw-r--r-- | libc2dcolorconvert/Android.mk | 8 | ||||
| -rwxr-xr-x | mm-video-legacy/vidc/vdec/Android.mk | 5 | ||||
| -rwxr-xr-x | mm-video-legacy/vidc/venc/Android.mk | 5 | ||||
| -rwxr-xr-x | mm-video-v4l2/vidc/vdec/Android.mk | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 4 |
5 files changed, 26 insertions, 0 deletions
diff --git a/libc2dcolorconvert/Android.mk b/libc2dcolorconvert/Android.mk index 42b74526..0d03c0ba 100644 --- a/libc2dcolorconvert/Android.mk +++ b/libc2dcolorconvert/Android.mk @@ -2,10 +2,18 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) + ifneq ($(TARGET_QCOM_DISPLAY_VARIANT),) DISPLAY := display-$(TARGET_QCOM_DISPLAY_VARIANT) else DISPLAY := display/$(TARGET_BOARD_PLATFORM) +# Fix the header inclusions for platform variants without an explicit path +ifneq ($(filter msm8610 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) + DISPLAY := display/msm8974 +endif +ifneq ($(filter msm8660 ,$(TARGET_BOARD_PLATFORM)),) + DISPLAY := display/msm8960 +endif endif LOCAL_SRC_FILES := \ diff --git a/mm-video-legacy/vidc/vdec/Android.mk b/mm-video-legacy/vidc/vdec/Android.mk index 0d0789fa..28b7e0b8 100755 --- a/mm-video-legacy/vidc/vdec/Android.mk +++ b/mm-video-legacy/vidc/vdec/Android.mk @@ -56,7 +56,12 @@ DISPLAY := display-$(TARGET_QCOM_DISPLAY_VARIANT) libOmxVdec-def += -DDISPLAYCAF else DISPLAY := display/$(TARGET_BOARD_PLATFORM) +# Fix the header inclusions for platform variants without an explicit path +ifneq ($(filter msm8660 ,$(TARGET_BOARD_PLATFORM)),) + DISPLAY := display/msm8960 endif +endif + libmm-vdec-inc := bionic/libc/include libmm-vdec-inc += bionic/libstdc++/include diff --git a/mm-video-legacy/vidc/venc/Android.mk b/mm-video-legacy/vidc/venc/Android.mk index d2213259..421227a2 100755 --- a/mm-video-legacy/vidc/venc/Android.mk +++ b/mm-video-legacy/vidc/venc/Android.mk @@ -46,7 +46,12 @@ ifneq ($(TARGET_QCOM_DISPLAY_VARIANT),) DISPLAY := display-$(TARGET_QCOM_DISPLAY_VARIANT) else DISPLAY := display/$(TARGET_BOARD_PLATFORM) +# Fix the header inclusions for platform variants without an explicit path +ifneq ($(filter msm8660 ,$(TARGET_BOARD_PLATFORM)),) + DISPLAY := display/msm8960 endif +endif + libmm-venc-inc := bionic/libc/include libmm-venc-inc += bionic/libstdc++/include diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index 20fe2ac8..9a3847b7 100755 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -91,6 +91,10 @@ DISPLAY := display-$(TARGET_QCOM_DISPLAY_VARIANT) libOmxVdec-def += -DDISPLAYCAF else DISPLAY := display/$(TARGET_BOARD_PLATFORM) +# Fix the header inclusions for platform variants without an explicit path +ifneq ($(filter msm8610 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) + DISPLAY := display/msm8974 +endif endif libmm-vdec-inc := bionic/libc/include diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index 7aea2206..592625aa 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -79,6 +79,10 @@ ifneq ($(TARGET_QCOM_DISPLAY_VARIANT),) DISPLAY := display-$(TARGET_QCOM_DISPLAY_VARIANT) else DISPLAY := display/$(TARGET_BOARD_PLATFORM) +# Fix the header inclusions for platform variants without an explicit path +ifneq ($(filter msm8610 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),) + DISPLAY := display/msm8974 +endif endif libmm-venc-inc := bionic/libc/include |