From 0ef588d656da87b50034c502b0f822f8a58d1f5c Mon Sep 17 00:00:00 2001
From: Sanket Chinchalkar <schinchalkar@google.com>
Date: Fri, 29 Jan 2021 13:32:20 -0800
Subject: [PATCH] Added CATBox Changes

Test: Tested Locally
Bug: 177692101
Change-Id: I76811dd996618fb80ef30256df4032557c5c6492
---
 core/main.mk         |  2 ++
 core/tasks/catbox.mk | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 core/tasks/catbox.mk

diff --git a/core/main.mk b/core/main.mk
index 5ea95c8e6..14ead7cb5 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -83,6 +83,8 @@ $(shell mkdir -p $(EMPTY_DIRECTORY) && rm -rf $(EMPTY_DIRECTORY)/*)
 -include test/vts/tools/vts-core-tradefed/build/config.mk
 # CSUITE-specific config.
 -include test/app_compat/csuite/tools/build/config.mk
+# CATBox-specific config.
+-include test/catbox/tools/build/config.mk
 
 # Clean rules
 .PHONY: clean-dex-files
diff --git a/core/tasks/catbox.mk b/core/tasks/catbox.mk
new file mode 100644
index 000000000..911c372ef
--- /dev/null
+++ b/core/tasks/catbox.mk
@@ -0,0 +1,23 @@
+# Copyright (C) 2021 The Android Open Source Project
+#
+# 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
+#
+#      http://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.
+
+test_suite_name := catbox
+test_suite_tradefed := catbox-tradefed
+test_suite_readme := test/catbox/tools/catbox-tradefed/README
+
+include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk
+
+.PHONY: catbox
+catbox: $(compatibility_zip)
+$(call dist-for-goals, catbox, $(compatibility_zip))
\ No newline at end of file