From 0c45c5b7ea59304c93a9e3bb301ed83b15c9c666 Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Fri, 28 Jun 2019 20:00:09 -0700
Subject: [PATCH] Fix skip athena and skip raspbian flags (#1735)

---
 shared/plugins/setupBuild.gradle           | 1 -
 simulation/frc_gazebo_plugins/build.gradle | 4 ++--
 simulation/gz_msgs/build.gradle            | 4 ++--
 simulation/halsim_gazebo/build.gradle      | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/shared/plugins/setupBuild.gradle b/shared/plugins/setupBuild.gradle
index 8591f079d2..1a0daa553a 100644
--- a/shared/plugins/setupBuild.gradle
+++ b/shared/plugins/setupBuild.gradle
@@ -11,7 +11,6 @@ ext {
 apply from: "${rootDir}/shared/nilibraries.gradle"
 
 if (!project.hasProperty('onlylinuxathena')) {
-    ext.skipAthena = true
     apply from: "${rootDir}/shared/config.gradle"
 
     model {
diff --git a/simulation/frc_gazebo_plugins/build.gradle b/simulation/frc_gazebo_plugins/build.gradle
index 6d3c90887d..918094f4e2 100644
--- a/simulation/frc_gazebo_plugins/build.gradle
+++ b/simulation/frc_gazebo_plugins/build.gradle
@@ -4,8 +4,8 @@ apply plugin: 'edu.wpi.first.NativeUtils'
 apply plugin: 'cpp'
 apply plugin: "google-test"
 
-ext.skipAthena = true
-ext.skipRaspbian = true
+ext.skiplinuxathena = true
+ext.skiplinuxraspbian = true
 
 apply from: "${rootDir}/shared/config.gradle"
 
diff --git a/simulation/gz_msgs/build.gradle b/simulation/gz_msgs/build.gradle
index aa0982595c..44f969220b 100644
--- a/simulation/gz_msgs/build.gradle
+++ b/simulation/gz_msgs/build.gradle
@@ -8,8 +8,8 @@ plugins {
 description = "A C++ and Java library to pass FRC Simulation Messages in and out of Gazebo."
 
 /* The simulation does not run on real hardware; so we always skip Athena */
-ext.skipAthena = true
-ext.skipRaspbian = true
+ext.skiplinuxathena = true
+ext.skiplinuxraspbian = true
 apply from: "${rootDir}/shared/config.gradle"
 
 /* Use a sort of poor man's autoconf to find the protobuf development
diff --git a/simulation/halsim_gazebo/build.gradle b/simulation/halsim_gazebo/build.gradle
index d9c22178cd..63e880917c 100644
--- a/simulation/halsim_gazebo/build.gradle
+++ b/simulation/halsim_gazebo/build.gradle
@@ -3,8 +3,8 @@ description = "A shared object library that will interface between a robot and t
 apply plugin: 'edu.wpi.first.NativeUtils'
 apply plugin: 'cpp'
 
-ext.skipAthena = true
-ext.skipRaspbian = true
+ext.skiplinuxathena = true
+ext.skiplinuxraspbian = true
 ext.pluginName = 'halsim_gazebo'
 
 /* If gz_msgs or gazebo is not available, do not attempt a build */