build: Remove module properties
This only removes code paths that are no longer used.
Bug: 600
Change-Id: I1cf70e093d1059c71a09c7efd4ea80577e8e2a89
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/79466
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Reviewed-by: Oliver Newman <olivernewman@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
diff --git a/recipe_modules/build/__init__.py b/recipe_modules/build/__init__.py
index 73cb0f3..dc5f7e0 100644
--- a/recipe_modules/build/__init__.py
+++ b/recipe_modules/build/__init__.py
@@ -14,8 +14,6 @@
# pylint: disable=missing-docstring
-from PB.recipe_modules.pigweed.build import properties
-
DEPS = [
'recipe_engine/cas',
'recipe_engine/context',
@@ -25,6 +23,4 @@
'recipe_engine/step',
]
-PROPERTIES = properties.InputProperties
-
PYTHON_VERSION_COMPATIBILITY = "PY3"
diff --git a/recipe_modules/build/api.py b/recipe_modules/build/api.py
index 7c00c93..ff3f89f 100644
--- a/recipe_modules/build/api.py
+++ b/recipe_modules/build/api.py
@@ -21,24 +21,17 @@
CAS_DIGEST_PROPERTY_NAME = 'cas_build_digest'
- def __init__(self, props, *args, **kwargs):
+ def __init__(self, *args, **kwargs):
super(BuildApi, self).__init__(*args, **kwargs)
- # Make these attributes public so recipes can override them.
- self.gn_args = list(props.gn_args)
- self.ninja_targets = list(props.ninja_targets)
self.dir = None
def initialize(self):
self.dir = self.m.path['start_dir'].join('build')
- def gn_gen(self, checkout_dir, options=None):
- # TODO(pwbug/600) Make options required.
+ def gn_gen(self, checkout_dir, options):
cmd = ['gn', 'gen']
- # TODO(pwbug/600) Always use options.
- gn_args = options.gn_args if options else self.gn_args
-
- for gn_arg in gn_args:
+ for gn_arg in options.gn_args:
cmd.append('--args={}'.format(gn_arg))
# Infrequently needed but harmless to always add this.
@@ -63,15 +56,12 @@
).stdout
return {x['name']: x for x in args or ()}
- def ninja(self, options=None):
- # TODO(pwbug/600) Make options required.
+ def ninja(self, options):
cmd = ['ninja', '-C', self.dir]
- # TODO(pwbug/600) Always use options.
- cmd.extend(options.ninja_targets if options else self.ninja_targets)
+ cmd.extend(options.ninja_targets)
self.m.step('ninja', cmd)
- def __call__(self, checkout_dir, options=None):
- # TODO(pwbug/600) Make options required.
+ def __call__(self, checkout_dir, options):
self.gn_gen(checkout_dir, options)
self.ninja(options)
diff --git a/recipe_modules/build/properties.proto b/recipe_modules/build/properties.proto
deleted file mode 100644
index ed13b9e..0000000
--- a/recipe_modules/build/properties.proto
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2020 The Pigweed Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy of
-// the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations under
-// the License.
-syntax = "proto3";
-
-package recipe_modules.pigweed.build;
-
-// TODO(pwbug/600) Remove this file.
-message InputProperties {
- // List of gn args ("var=value", ...). Default: empty.
- repeated string gn_args = 1;
-
- // List of targets to build. Default: empty (build default target).
- repeated string ninja_targets = 2;
-}
