From f0f8e349ae2a176a53689c1404f6a756bb414bdb Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@google.com>
Date: Wed, 17 Apr 2019 00:25:58 +0000
Subject: [PATCH] [build] Remove monolith, preinstall, and available

These are no longer valid build arguments. Please use
base_package_labels, cache_package_labels, and universe_package_labels
instead.

Change-Id: I3213b7d72b84b35c75d21106af91e648b415ca09
---
 build/gn/packages.gni | 17 ++++-------------
 products/bringup.gni  |  6 ------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/build/gn/packages.gni b/build/gn/packages.gni
index 835eeb971e9..20c3ed0bc29 100644
--- a/build/gn/packages.gni
+++ b/build/gn/packages.gni
@@ -7,19 +7,6 @@ declare_args() {
   # priority, and the package will be added to OTA images as part of the
   # verified boot set of static packages.
 
-  # These arguments should be set by the product definition gni file.
-
-  # a list of packages included in OTA images, base system images, and the
-  # distribution repository.
-  monolith = []
-
-  # a list of packages pre-installed on the system (also added to the
-  # distribution repository)
-  preinstall = []
-
-  # a list of packages only added to the distribution repository)
-  available = []
-
   # Does nothing.
   #
   # Will be removed after 30 April 2019.
@@ -45,6 +32,10 @@ declare_args() {
   extra_package_labels = []
 }
 
+monolith = []
+preinstall = []
+available = []
+
 monolith += board_packages
 monolith += fuchsia_packages
 
diff --git a/products/bringup.gni b/products/bringup.gni
index 74868bff27e..79efcff3be2 100644
--- a/products/bringup.gni
+++ b/products/bringup.gni
@@ -11,9 +11,3 @@ base_package_labels = []
 cache_package_labels = []
 
 universe_package_labels = [ "//garnet/packages/prod:vboot_reference" ]
-
-monolith = []
-
-preinstall = []
-
-available = []
-- 
GitLab