From dd89daa69d175bc9908829249934c996ff62b221 Mon Sep 17 00:00:00 2001
From: Park Ju Hyung <qkrwngud825@gmail.com>
Date: Wed, 25 Mar 2020 21:05:13 +0900
Subject: [PATCH] manifest: allow easier switch between tags

Just add repositories from all 4.4/4.9/4.14 tags
and remove it via obsolete.xml

Change-Id: Ie8d20ca1b6add35f61d7c398d4a84096ae595726
Signed-off-by: Park Ju Hyung <qkrwngud825@gmail.com>
---
 default.xml            |  8 ++++++++
 manifests/obsolete.xml | 20 ++++++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/default.xml b/default.xml
index a0b33e4..c953670 100644
--- a/default.xml
+++ b/default.xml
@@ -71,6 +71,8 @@
   <project name="device/qcom/sepolicy"/>
   <project name="device/sample"/>
   <project name="kernel/configs"/>
+  <project name="kernel/msm-4.4" />
+  <project name="kernel/msm-4.9" />
   <project name="kernel/msm-4.14" />
   <project name="kernel/tests"/>
   <project name="platform/art" path="art"/>
@@ -507,6 +509,7 @@
   <project name="platform/hardware/nxp/secure_element" path="hardware/nxp/secure_element"/>
   <project name="platform/hardware/qcom/audio" path="vendor/qcom/opensource/audio-hal/primary-hal"/>
   <project name="platform/hardware/qcom/bootctrl" path="hardware/qcom/bootctrl"/>
+  <project name="platform/hardware/qcom/camera" path="hardware/qcom/camera"/>
   <project name="platform/hardware/qcom/display" path="hardware/qcom/display">
     <linkfile dest="vendor/qcom/defs/product-defs/vendor/display-product.mk" src="config/display-product.mk"/>
     <linkfile dest="vendor/qcom/defs/board-defs/vendor/display-board.mk" src="config/display-board.mk"/>
@@ -824,8 +827,13 @@
   <project name="platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn" path="vendor/qcom/opensource/wlan/qca-wifi-host-cmn"/>
   <project name="platform/vendor/qcom-opensource/wlan/qcacld-3.0" path="vendor/qcom/opensource/wlan/qcacld-3.0"/>
   <project name="platform/vendor/qcom-opensource/wlan/utils/sigma-dut" path="vendor/qcom/opensource/wlan/utils/sigma-dut"/>
+  <project name="platform/vendor/qcom/atoll" path="device/qcom/atoll"/>
+  <project name="platform/vendor/qcom/cobalt" path="device/qcom/cobalt"/>
+  <project name="platform/vendor/qcom/falcon_32" path="device/qcom/falcon_32"/>
+  <project name="platform/vendor/qcom/falcon_64" path="device/qcom/falcon_64"/>
   <project name="platform/vendor/qcom/ferrum" path="device/qcom/msm8909"/>
   <project name="platform/vendor/qcom/msm8909go" path="device/qcom/msm8909go"/>
+  <project name="platform/vendor/qcom/msm8937_32go" path="device/qcom/msm8937_32go"/>
   <project name="platform/vendor/qcom/msmnile" path="device/qcom/msmnile"/>
   <project name="platform/vendor/qcom/skunk" path="device/qcom/sdm845"/>
   <project name="platform/vendor/qcom/steppe" path="device/qcom/sm6150"/>
diff --git a/manifests/obsolete.xml b/manifests/obsolete.xml
index 76bc842..e36760e 100644
--- a/manifests/obsolete.xml
+++ b/manifests/obsolete.xml
@@ -31,7 +31,6 @@
   <remove-project name="platform/developers/samples/android"/>
   <remove-project name="platform/vendor/qcom-opensource/fm-commonsys" />
   <remove-project name="platform/vendor/qcom-opensource/fst-manager"/>
-  <remove-project name="platform/vendor/opensource/audio-kernel"/>
   <remove-project name="platform/vendor/qcom-opensource/wlan/fw-api"/>
   <remove-project name="platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn"/>
   <remove-project name="platform/vendor/qcom-opensource/wlan/qcacld-3.0"/>
@@ -45,7 +44,6 @@
   <remove-project name="platform/hardware/qcom/display"/>
   <remove-project name="platform/hardware/qcom/gps"/>
   <remove-project name="platform/hardware/qcom/media"/>
-  <remove-project name="platform/vendor/qcom-opensource/display-commonsys-intf"/>
   <remove-project name="platform/vendor/qcom-opensource/location"/>
   <!--
   <remove-project name="platform/packages/apps/Camera2" />
@@ -58,15 +56,25 @@
   <remove-project name="platform/vendor/codeaurora/packages/apps/SoundRecorder"/>
   <remove-project name="platform/hardware/qcom/thermal"/>
 
-  <!-- UM 4.9 series
+  <!-- UM 4.4 series -->
+  <remove-project name="kernel/msm-4.4"/>
+  <remove-project name="platform/hardware/qcom/camera"/>
+  <remove-project name="platform/vendor/qcom/cobalt"/>
+  <remove-project name="platform/vendor/qcom/falcon_32"/>
+  <remove-project name="platform/vendor/qcom/falcon_64"/>
+  <remove-project name="platform/vendor/qcom/msm8937_32go"/>
+
+  <!-- UM 4.9 series -->
   <remove-project name="kernel/msm-4.9"/>
-  <remove-project name="platform/vendor/qcom/peafowl"/>
-  <remove-project name="platform/vendor/qcom/qcs605"/>
-  -->
+  <remove-project name="platform/vendor/opensource/audio-kernel"/>
+  <remove-project name="platform/vendor/qcom-opensource/display-commonsys-intf"/>
+  <remove-project name="platform/vendor/qcom-opensource/wfd-commonsys"/>
 
   <!-- UM 4.14 series -->
   <remove-project name="kernel/msm-4.14"/>
   <remove-project name="platform/vendor/qcom-opensource/data-kernel"/>
+  <remove-project name="platform/vendor/qcom-opensource/vibrator"/>
+  <remove-project name="platform/vendor/qcom/atoll"/>
   <remove-project name="platform/vendor/qcom/msmnile"/>
   <remove-project name="platform/vendor/qcom/steppe"/>