From fe6e19cbebfab60813ba14ea3f774a747bda108f Mon Sep 17 00:00:00 2001
From: Tom Cherry <tomcherry@google.com>
Date: Mon, 22 May 2017 13:26:18 -0700
Subject: [PATCH] Revert "Add test config to init_tests"

This reverts commit bdfd395e473c1195d47a77735460ef17644a34b7.

We want to keep AOSP and internal master in sync and since this isn't
being used, instead of cherry-picking to AOSP, we'll revert from internal.

Test: Build
Change-Id: I161b4c7187ec260841605149b7eee7df64434246
---
 init/Android.mk      |  1 -
 init/AndroidTest.xml | 26 --------------------------
 2 files changed, 27 deletions(-)
 delete mode 100644 init/AndroidTest.xml

diff --git a/init/Android.mk b/init/Android.mk
index 617a80953..0db65cb94 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -147,7 +147,6 @@ include $(CLEAR_VARS)
 # b/38002385, work around clang-tidy segmentation fault.
 LOCAL_TIDY_CHECKS := -misc-forwarding-reference-overload
 LOCAL_MODULE := init_tests
-LOCAL_COMPATIBILITY_SUITE := device-tests
 LOCAL_SRC_FILES := \
     devices_test.cpp \
     init_parser_test.cpp \
diff --git a/init/AndroidTest.xml b/init/AndroidTest.xml
deleted file mode 100644
index 3de69edb4..000000000
--- a/init/AndroidTest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<configuration description="Config for init_tests">
-    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
-        <option name="cleanup" value="true" />
-        <option name="push" value="init_tests->/data/local/tmp/init_tests" />
-    </target_preparer>
-    <option name="test-suite-tag" value="apct" />
-    <test class="com.android.tradefed.testtype.GTest" >
-        <option name="native-test-device-path" value="/data/local/tmp" />
-        <option name="module-name" value="init_tests" />
-    </test>
-</configuration>