From ac36a9a9e5bd4ca4a89b50d566d40000a932d0f4 Mon Sep 17 00:00:00 2001
From: Xin Li <delphij@google.com>
Date: Mon, 4 Dec 2017 15:48:39 -0800
Subject: [PATCH] DO NOT MERGE: Connect external/google-api-services-storage
 and test/sts to platform manifest.

While I'm there also disconnect packages/apps/RetailDemo from build.

Bug: 69925323
Change-Id: Ie664c0063f855dfc13ae8c69a84f614d095090eb
---
 default.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index ad6517d..e12392b 100644
--- a/default.xml
+++ b/default.xml
@@ -156,6 +156,7 @@
   <project path="external/giflib" name="platform/external/giflib" groups="pdk,qcom_msm8x26" />
   <project path="external/glide" name="platform/external/glide" groups="pdk-fs" />
   <project path="external/golang-protobuf" name="platform/external/golang-protobuf" groups="pdk" />
+  <project path="external/google-api-services-storage" name="platform/external/google-api-services-storage" groups="pdk" />
   <project path="external/google-benchmark" name="platform/external/google-benchmark" groups="pdk" />
   <project path="external/google-breakpad" name="platform/external/google-breakpad" groups="dragon,pdk-fs" />
   <project path="external/google-fonts/carrois-gothic-sc" name="platform/external/google-fonts/carrois-gothic-sc" groups="pdk" />
@@ -492,7 +493,6 @@
   <project path="packages/apps/Protips" name="platform/packages/apps/Protips" groups="pdk-fs" />
   <project path="packages/apps/Provision" name="platform/packages/apps/Provision" groups="pdk-fs" />
   <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" groups="pdk-fs" />
-  <project path="packages/apps/RetailDemo" name="platform/packages/apps/RetailDemo" groups="pdk-fs" />
   <project path="packages/apps/SafetyRegulatoryInfo" name="platform/packages/apps/SafetyRegulatoryInfo" groups="pdk-fs" />
   <project path="packages/apps/SecureElement" name="platform/packages/apps/SecureElement" groups="apps_se,pdk-fs" />
   <project path="packages/apps/Settings" name="platform/packages/apps/Settings" groups="pdk-fs" />
@@ -621,6 +621,7 @@
   <project path="test/vti/dashboard" name="platform/test/vti/dashboard" groups="vts,pdk" />
   <project path="test/vti/fuzz_test_serving" name="platform/test/vti/fuzz_test_serving" groups="vts,pdk" />
   <project path="test/vti/test_serving" name="platform/test/vti/test_serving" groups="vts,pdk" />
+  <project path="test/sts" name="platform/test/sts" groups="sts,pdk" />
   <project path="toolchain/benchmark" name="toolchain/benchmark" />
   <project path="toolchain/binutils" name="toolchain/binutils" />
   <project path="tools/adt/idea" name="platform/tools/adt/idea" groups="notdefault,tools" />