Refactor System*Events to put them down into platform where they will…

… live beside their modules. PiperOrigin-RevId: 411656223
axivion · Nov 22, 2021 · a882f87 · a882f87
1 parent d3a4b7f
commit a882f87
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/platform/BUILD b/src/main/java/com/google/devtools/build/lib/platform/BUILD
@@ -23,6 +23,7 @@ java_library(
 java_library(
     name = "system_suspension_module",
     srcs = [
+        "SystemSuspensionEvent.java",
         "SystemSuspensionModule.java",
     ],
     deps = [
@@ -37,6 +38,7 @@ java_library(
 java_library(
     name = "system_thermal_module",
     srcs = [
+        "SystemThermalEvent.java",
         "SystemThermalModule.java",
     ],
     deps = [

diff --git a/...ool/buildevent/SystemSuspensionEvent.java → ...d/lib/platform/SystemSuspensionEvent.java b/...ool/buildevent/SystemSuspensionEvent.java → ...d/lib/platform/SystemSuspensionEvent.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.buildtool.buildevent;
+package com.google.devtools.build.lib.platform;
 
 import com.google.devtools.build.lib.events.ExtendedEventHandler;
 

diff --git a/src/main/java/com/google/devtools/build/lib/platform/SystemSuspensionModule.java b/src/main/java/com/google/devtools/build/lib/platform/SystemSuspensionModule.java
@@ -15,7 +15,6 @@
 package com.google.devtools.build.lib.platform;
 
 import com.google.common.flogger.GoogleLogger;
-import com.google.devtools.build.lib.buildtool.buildevent.SystemSuspensionEvent;
 import com.google.devtools.build.lib.events.Reporter;
 import com.google.devtools.build.lib.jni.JniLoader;
 import com.google.devtools.build.lib.runtime.BlazeModule;

diff --git a/...ldtool/buildevent/SystemThermalEvent.java → ...uild/lib/platform/SystemThermalEvent.java b/...ldtool/buildevent/SystemThermalEvent.java → ...uild/lib/platform/SystemThermalEvent.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.buildtool.buildevent;
+package com.google.devtools.build.lib.platform;
 
 import com.google.devtools.build.lib.events.ExtendedEventHandler;
 

diff --git a/src/main/java/com/google/devtools/build/lib/platform/SystemThermalModule.java b/src/main/java/com/google/devtools/build/lib/platform/SystemThermalModule.java
@@ -15,7 +15,6 @@
 package com.google.devtools.build.lib.platform;
 
 import com.google.common.flogger.GoogleLogger;
-import com.google.devtools.build.lib.buildtool.buildevent.SystemThermalEvent;
 import com.google.devtools.build.lib.events.Reporter;
 import com.google.devtools.build.lib.jni.JniLoader;
 import com.google.devtools.build.lib.runtime.BlazeModule;

diff --git a/src/test/java/com/google/devtools/build/lib/platform/SystemSuspensionEventTest.java b/src/test/java/com/google/devtools/build/lib/platform/SystemSuspensionEventTest.java
@@ -17,7 +17,6 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.eventbus.Subscribe;
-import com.google.devtools.build.lib.buildtool.buildevent.SystemSuspensionEvent;
 import com.google.devtools.build.lib.buildtool.util.BuildIntegrationTestCase;
 import com.google.devtools.build.lib.packages.util.MockGenruleSupport;
 import com.google.devtools.build.lib.runtime.BlazeModule;