msm8974: Move toward new cm-12.0 branching system

Change-Id: I4f58e03efe3b42a5cf3fcea28aa7e0e9fa7dbe93
This commit is contained in:
Tony Layher 2014-11-11 09:48:27 -05:00
parent 5df5bd5278
commit 4bf9d92722
2 changed files with 10 additions and 6 deletions

View File

@ -24,7 +24,6 @@ TARGET_CPU_VARIANT := krait
# Audio # Audio
BOARD_USES_ALSA_AUDIO := true BOARD_USES_ALSA_AUDIO := true
TARGET_QCOM_AUDIO_VARIANT := caf
TARGET_USES_QCOM_COMPRESSED_AUDIO := true TARGET_USES_QCOM_COMPRESSED_AUDIO := true
# Bluetooth # Bluetooth
@ -45,7 +44,6 @@ PRODUCT_BOOT_JARS := $(subst $(space),:,$(PRODUCT_BOOT_JARS))
# Display # Display
BOARD_EGL_CFG := device/samsung/msm8974-common/configs/egl.cfg BOARD_EGL_CFG := device/samsung/msm8974-common/configs/egl.cfg
TARGET_QCOM_DISPLAY_VARIANT := caf-new
NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
OVERRIDE_RS_DRIVER:= libRSDriver_adreno.so OVERRIDE_RS_DRIVER:= libRSDriver_adreno.so
@ -60,7 +58,6 @@ MAX_EGL_CACHE_KEY_SIZE := 12*1024
MAX_EGL_CACHE_SIZE := 2048*1024 MAX_EGL_CACHE_SIZE := 2048*1024
# Media # Media
TARGET_QCOM_MEDIA_VARIANT := caf-new
TARGET_ENABLE_QC_AV_ENHANCEMENTS := true TARGET_ENABLE_QC_AV_ENHANCEMENTS := true
# Qualcomm support # Qualcomm support

View File

@ -8,11 +8,18 @@
"target_path": "device/samsung/qcom-common" "target_path": "device/samsung/qcom-common"
}, },
{ {
"repository": "android_hardware_qcom_display-caf-new", "repository": "android_hardware_qcom_audio",
"target_path": "hardware/qcom/display-caf-new" "target_path": "hardware/qcom/audio-caf/default"
"branch": "cm-12.0-caf-8974"
},
{
"repository": "android_hardware_qcom_display",
"target_path": "hardware/qcom/display-caf/msm8974"
"branch": "cm-12.0-caf-8974"
}, },
{ {
"repository": "android_hardware_qcom_media-caf-new", "repository": "android_hardware_qcom_media-caf-new",
"target_path": "hardware/qcom/media-caf-new" "target_path": "hardware/qcom/media-caf/msm8974"
"branch": "cm-12.0-caf-8974"
} }
] ]