From 5fe2eebceb30a1a7d9942ac82a6dee0ec89e4f1e Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 29 Jun 2019 21:05:44 -0700 Subject: [PATCH] Revert "Don't build halsim_gazebo on raspbian (#1737)" (#1743) This reverts commit d9cb57a429c4e7aac86733d18955ce834cc56e99. --- simulation/halsim_gazebo/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/simulation/halsim_gazebo/build.gradle b/simulation/halsim_gazebo/build.gradle index 286f959c9b..63e880917c 100644 --- a/simulation/halsim_gazebo/build.gradle +++ b/simulation/halsim_gazebo/build.gradle @@ -7,8 +7,6 @@ ext.skiplinuxathena = true ext.skiplinuxraspbian = true ext.pluginName = 'halsim_gazebo' -apply from: "${rootDir}/shared/config.gradle" - /* If gz_msgs or gazebo is not available, do not attempt a build */ def gazebo_version = "" def gazebo_cppflags = "" @@ -36,8 +34,10 @@ if (!gazebo_version?.trim()) { evaluationDependsOn(":simulation:gz_msgs") def gz_msgs_project = project(":simulation:gz_msgs") -tasks.whenTaskAdded { task -> - task.onlyIf { !gz_msgs_project.hasProperty('skip_gz_msgs') && !project.hasProperty('skip_frc_plugins') } +if (!gz_msgs_project.hasProperty('skip_gz_msgs') && !project.hasProperty('skip_frc_plugins')) { + + apply from: "${rootDir}/shared/plugins/setupBuild.gradle" + } model {