Inherit from msm8974-common

* msm8974-common then inherits from qcom-common.
* This doesn't change anything currently, just adds one more
  common tree in between - however, later on, we can start moving
  things to this new tree as needed, from both shinano-common
  and qcom-common

Change-Id: Ib0a5bca4569501e8504ae18b04c98f59130fe4be

3 files changed, 6 insertions, 6 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index c2a5ecb..6fa0848 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -17,8 +17,8 @@ include device/sony/common/BoardConfigCommon.mk
 
 BOARD_EGL_CFG := device/sony/shinano-common/rootdir/system/lib/egl/egl.cfg
 
-# inherit from qcom-common
-include device/sony/qcom-common/BoardConfigCommon.mk
+# inherit from msm8974-common
+include device/sony/msm8974-common/BoardConfigCommon.mk
 
 TARGET_SPECIFIC_HEADER_PATH := device/sony/shinano-common/include
 
diff --git a/cm.dependencies b/cm.dependencies
index a77aa7f..bd8ab92 100644
--- a/cm.dependencies
+++ b/cm.dependencies
@@ -4,8 +4,8 @@
     "target_path": "kernel/sony/msm8974pro"
   },
   {
-    "repository": "android_device_sony_qcom-common",
-    "target_path": "device/sony/qcom-common"
+    "repository": "android_device_sony_msm8974-common",
+    "target_path": "device/sony/msm8974-common"
   },
   {
     "repository": "android_hardware_qcom_display-caf-new",
diff --git a/shinano.mk b/shinano.mk
index 42e7d26..bd64221 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -14,8 +14,8 @@
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
 
-# qcom common
-$(call inherit-product, device/sony/qcom-common/qcom-common.mk)
+# inherit from msm8974-common
+$(call inherit-product, device/sony/msm8974-common/msm8974.mk)
 
 COMMON_PATH := device/sony/shinano-common