Fix build: Revert "Add CTS tests for NDK tracing"
This reverts commit 2b63369e1122eb17c1b45d3c51fd86e61bd607d9.
Change-Id: I9edee1c04b6c0125e5b4295f05a3fc5578e05c6a
diff --git a/hostsidetests/atrace/AtraceTestApp/Android.mk b/hostsidetests/atrace/AtraceTestApp/Android.mk
index b594980..0eb7cfd 100644
--- a/hostsidetests/atrace/AtraceTestApp/Android.mk
+++ b/hostsidetests/atrace/AtraceTestApp/Android.mk
@@ -23,8 +23,6 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
-LOCAL_JNI_SHARED_LIBRARIES := libnativeatrace_jni
-
LOCAL_PACKAGE_NAME := CtsAtraceTestApp
# sign this app with a different cert than CtsSimpleAppInstallDiffCert
@@ -33,5 +31,3 @@
#LOCAL_DEX_PREOPT := false
include $(BUILD_CTS_SUPPORT_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/atrace/AtraceTestApp/jni/Android.mk b/hostsidetests/atrace/AtraceTestApp/jni/Android.mk
deleted file mode 100644
index 73cdd86..0000000
--- a/hostsidetests/atrace/AtraceTestApp/jni/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2015 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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LIB_PATH := $(LOCAL_PATH)/../libs/$(TARGET_ARCH_ABI)/
-LOCAL_MODULE := libnativeatrace_jni
-# Don't include this package in any configuration by default.
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := AtraceTestAppJni.c
-LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
-LOCAL_LDLIBS := -L$(LIB_PATH) -landroid -llog
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/hostsidetests/atrace/AtraceTestApp/jni/AtraceTestAppJni.c b/hostsidetests/atrace/AtraceTestApp/jni/AtraceTestAppJni.c
deleted file mode 100644
index 151326d..0000000
--- a/hostsidetests/atrace/AtraceTestApp/jni/AtraceTestAppJni.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2015 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.
- */
-
-#include <jni.h>
-#include <android/log.h>
-#include <android/trace.h>
-
-#define UNUSED(X) ((void) X)
-
-JNIEXPORT void Java_com_android_cts_atracetestapp_AtraceTestAppActivity_nativeTraceSection(
- JNIEnv* env, jclass clazz) {
- UNUSED(env);
- UNUSED(clazz);
- if (ATrace_isEnabled()) {
- __android_log_print(ANDROID_LOG_DEBUG, "ATraceTestApp", "Tracing enabled");
-
- // NOTE: must match string in required section list in ATraceHostTest#testTracingContent
- ATrace_beginSection("traceable-app-native-test-section");
- ATrace_endSection();
- } else {
- __android_log_print(ANDROID_LOG_DEBUG, "ATraceTestApp", "Tracing disabled");
- }
-}
diff --git a/hostsidetests/atrace/AtraceTestApp/src/com/android/cts/atracetestapp/AtraceTestAppActivity.java b/hostsidetests/atrace/AtraceTestApp/src/com/android/cts/atracetestapp/AtraceTestAppActivity.java
index 4eccef3..0269d0d 100644
--- a/hostsidetests/atrace/AtraceTestApp/src/com/android/cts/atracetestapp/AtraceTestAppActivity.java
+++ b/hostsidetests/atrace/AtraceTestApp/src/com/android/cts/atracetestapp/AtraceTestAppActivity.java
@@ -20,17 +20,10 @@
import android.os.Trace;
public class AtraceTestAppActivity extends Activity {
- static {
- System.loadLibrary("nativeatrace_jni");
- }
-
- private static native void nativeTraceSection();
-
@Override
protected void onCreate(Bundle savedInstanceState) {
Trace.beginSection("traceable-app-test-section");
super.onCreate(savedInstanceState);
Trace.endSection();
- nativeTraceSection();
}
}
diff --git a/hostsidetests/atrace/src/android/atrace/cts/AtraceHostTest.java b/hostsidetests/atrace/src/android/atrace/cts/AtraceHostTest.java
index 8a7f081..ee0511d 100644
--- a/hostsidetests/atrace/src/android/atrace/cts/AtraceHostTest.java
+++ b/hostsidetests/atrace/src/android/atrace/cts/AtraceHostTest.java
@@ -172,12 +172,7 @@
// list of tags expected to be seen on app launch, in order.
String[] requiredSectionList = {
- // must match string in AtraceTestAppActivity#onCreate
"traceable-app-test-section",
-
- // must match string in AtraceTestAppJni.c
- "traceable-app-native-test-section",
-
"inflate",
"performTraversals",
"measure",
