Merge "Merge cherrypicks of [719644] into oreo-mr1-cts-release" into oreo-mr1-cts-release
diff --git a/tests/signature/api-check/Android.mk b/tests/signature/api-check/Android.mk
index 8f00386..013cc4d 100644
--- a/tests/signature/api-check/Android.mk
+++ b/tests/signature/api-check/Android.mk
@@ -32,7 +32,6 @@
cts-signature-common \
repackaged-legacy-test \
repackaged.android.test.runner \
- compatibility-device-util
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/tests/signature/api-check/src/android/signature/cts/api/SignatureTest.java b/tests/signature/api-check/src/android/signature/cts/api/SignatureTest.java
index eb8dc63..3473cfd 100644
--- a/tests/signature/api-check/src/android/signature/cts/api/SignatureTest.java
+++ b/tests/signature/api-check/src/android/signature/cts/api/SignatureTest.java
@@ -23,7 +23,6 @@
import android.signature.cts.JDiffClassDescription;
import android.signature.cts.ReflectionHelper;
import android.signature.cts.ResultObserver;
-import com.android.compatibility.common.util.CddTest;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -40,7 +39,6 @@
/**
* Performs the signature check via a JUnit test.
*/
-@CddTest(requirement="3.6/C-0-1,C-0-2")
public class SignatureTest extends InstrumentationTestCase {
private static final String TAG = SignatureTest.class.getSimpleName();
diff --git a/tests/signature/intent-check/src/android/signature/cts/intent/IntentTest.java b/tests/signature/intent-check/src/android/signature/cts/intent/IntentTest.java
index 756a432..2f551dc 100644
--- a/tests/signature/intent-check/src/android/signature/cts/intent/IntentTest.java
+++ b/tests/signature/intent-check/src/android/signature/cts/intent/IntentTest.java
@@ -28,7 +28,6 @@
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
-import com.android.compatibility.common.util.CddTest;
import com.android.compatibility.common.util.DynamicConfigDeviceSide;
import org.junit.Assert;
@@ -50,7 +49,6 @@
* Validate that the android intents used by APKs on this device are part of the
* platform.
*/
-@CddTest(requirement="3.2.3.3/C-0-1,C-0-2")
@RunWith(AndroidJUnit4.class)
public class IntentTest {
private static final String TAG = IntentTest.class.getSimpleName();
