diff options
author | Praneeth Bajjuri | 2018-10-22 10:15:54 -0500 |
---|---|---|
committer | Praneeth Bajjuri | 2018-10-22 10:21:45 -0500 |
commit | 3103808204c447f3c3283308139634f922b21c58 (patch) | |
tree | 766b7a2b0733a8d016e24f6375e057952bdea946 | |
parent | cd0142da919834d82fe58ff2f858777e0616cb20 (diff) | |
download | manifest-3103808204c447f3c3283308139634f922b21c58.tar.gz manifest-3103808204c447f3c3283308139634f922b21c58.tar.xz manifest-3103808204c447f3c3283308139634f922b21c58.zip |
ti-master: manifest: fix remote update error
googlesource/platform/manifest master update to ti-master
did not update projects as in aosp master.
device/ti/beagle_x15* are defined twice in the manifest
some other device projects were not pulled
removing the duplicate and keeping in sync with aosp master
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r-- | default.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/default.xml b/default.xml index 2d01360..5865495 100644 --- a/default.xml +++ b/default.xml | |||
@@ -54,6 +54,9 @@ | |||
54 | <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device,pdk" /> | 54 | <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device,pdk" /> |
55 | <project path="device/google/atv" name="device/google/atv" groups="device,broadcom_pdk,generic_fs,pdk" /> | 55 | <project path="device/google/atv" name="device/google/atv" groups="device,broadcom_pdk,generic_fs,pdk" /> |
56 | <project path="device/google/contexthub" name="device/google/contexthub" groups="device,marlin,pdk" /> | 56 | <project path="device/google/contexthub" name="device/google/contexthub" groups="device,marlin,pdk" /> |
57 | <project path="device/google/crosshatch" name="device/google/crosshatch" groups="device,crosshatch" /> | ||
58 | <project path="device/google/crosshatch-kernel" name="device/google/crosshatch-kernel" groups="device,crosshatch" clone-depth="1" /> | ||
59 | <project path="device/google/crosshatch-sepolicy" name="device/google/crosshatch-sepolicy" groups="device,crosshatch" /> | ||
57 | <project path="device/google/cuttlefish" name="device/google/cuttlefish" groups="device,pdk" /> | 60 | <project path="device/google/cuttlefish" name="device/google/cuttlefish" groups="device,pdk" /> |
58 | <project path="device/google/cuttlefish_common" name="device/google/cuttlefish_common" groups="device,pdk" /> | 61 | <project path="device/google/cuttlefish_common" name="device/google/cuttlefish_common" groups="device,pdk" /> |
59 | <project path="device/google/cuttlefish_kernel" name="device/google/cuttlefish_kernel" groups="device,pdk" clone-depth="1" /> | 62 | <project path="device/google/cuttlefish_kernel" name="device/google/cuttlefish_kernel" groups="device,pdk" clone-depth="1" /> |
@@ -71,8 +74,6 @@ | |||
71 | <project path="device/linaro/hikey-kernel" name="device/linaro/hikey-kernel" groups="device,hikey,pdk" clone-depth="1" /> | 74 | <project path="device/linaro/hikey-kernel" name="device/linaro/hikey-kernel" groups="device,hikey,pdk" clone-depth="1" /> |
72 | <project path="device/linaro/poplar" name="device/linaro/poplar" groups="device,poplar,pdk" /> | 75 | <project path="device/linaro/poplar" name="device/linaro/poplar" groups="device,poplar,pdk" /> |
73 | <project path="device/linaro/poplar-kernel" name="device/linaro/poplar-kernel" groups="device,poplar,pdk" clone-depth="1" /> | 76 | <project path="device/linaro/poplar-kernel" name="device/linaro/poplar-kernel" groups="device,poplar,pdk" clone-depth="1" /> |
74 | <project path="device/ti/beagle_x15" name="device/ti/beagle-x15" groups="device,ti" /> | ||
75 | <project path="device/ti/beagle_x15-kernel" name="device/ti/beagle-x15-kernel" groups="device,ti" /> | ||
76 | <project path="device/sample" name="device/sample" groups="pdk" /> | 77 | <project path="device/sample" name="device/sample" groups="pdk" /> |
77 | <project path="device/ti/beagle_x15" name="device/ti/beagle-x15" groups="device,beagle_x15,pdk" /> | 78 | <project path="device/ti/beagle_x15" name="device/ti/beagle-x15" groups="device,beagle_x15,pdk" /> |
78 | <project path="device/ti/beagle_x15-kernel" name="device/ti/beagle-x15-kernel" groups="device,beagle_x15,pdk" clone-depth="1" /> | 79 | <project path="device/ti/beagle_x15-kernel" name="device/ti/beagle-x15-kernel" groups="device,beagle_x15,pdk" clone-depth="1" /> |
@@ -485,6 +486,15 @@ | |||
485 | <project path="hardware/qcom/msm8x27" name="platform/hardware/qcom/msm8x27" groups="qcom_msm8x27,pdk-qcom" /> | 486 | <project path="hardware/qcom/msm8x27" name="platform/hardware/qcom/msm8x27" groups="qcom_msm8x27,pdk-qcom" /> |
486 | <project path="hardware/qcom/msm8x84" name="platform/hardware/qcom/msm8x84" groups="qcom_msm8x84,pdk-qcom" /> | 487 | <project path="hardware/qcom/msm8x84" name="platform/hardware/qcom/msm8x84" groups="qcom_msm8x84,pdk-qcom" /> |
487 | <project path="hardware/qcom/neuralnetworks/hvxservice" name="platform/hardware/qcom/neuralnetworks/hvxservice" groups="wahoo" /> | 488 | <project path="hardware/qcom/neuralnetworks/hvxservice" name="platform/hardware/qcom/neuralnetworks/hvxservice" groups="wahoo" /> |
489 | <project path="hardware/qcom/sdm845/bt" name="platform/hardware/qcom/sdm845/bt" groups="qcom_sdm845" /> | ||
490 | <project path="hardware/qcom/sdm845/data/ipacfg-mgr" name="platform/hardware/qcom/sdm845/data/ipacfg-mgr" groups="vendor,qcom_sdm845" > | ||
491 | <linkfile src="os_pickup.mk" dest="hardware/qcom/sdm845/Android.mk" /> | ||
492 | </project> | ||
493 | <project path="hardware/qcom/sdm845/display" name="platform/hardware/qcom/sdm845/display" groups="qcom_sdm845" /> | ||
494 | <project path="hardware/qcom/sdm845/gps" name="platform/hardware/qcom/sdm845/gps" groups="qcom_sdm845" /> | ||
495 | <project path="hardware/qcom/sdm845/media" name="platform/hardware/qcom/sdm845/media" groups="qcom_sdm845" /> | ||
496 | <project path="hardware/qcom/sdm845/thermal" name="platform/hardware/qcom/sdm845/thermal" groups="qcom_sdm845" /> | ||
497 | <project path="hardware/qcom/sdm845/vr" name="platform/hardware/qcom/sdm845/vr" groups="qcom_sdm845" /> | ||
488 | <project path="hardware/qcom/power" name="platform/hardware/qcom/power" groups="qcom,pdk-qcom" /> | 498 | <project path="hardware/qcom/power" name="platform/hardware/qcom/power" groups="qcom,pdk-qcom" /> |
489 | <project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" groups="qcom_wlan,pdk-qcom" /> | 499 | <project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" groups="qcom_wlan,pdk-qcom" /> |
490 | <project path="hardware/ril" name="platform/hardware/ril" groups="pdk" /> | 500 | <project path="hardware/ril" name="platform/hardware/ril" groups="pdk" /> |