| commit | 1fef2b8ef2c9a567fc44011dab4dd69297a32ac8 | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Mon Feb 26 10:26:37 2018 +0900 |
| committer | Jiyong Park <jiyong@google.com> | Mon Feb 26 10:58:36 2018 +0900 |
| tree | eddb6fcb27bf9e66c71320d455d831cff6daa403 | |
| parent | 488e9c52ad76efdb82a8237e40d54a34a15c3a6c [diff] |
Move HiddenApiTest from src to src/java The java files have recently been moved to src/java in order to have both java and native source files under src. However, HiddenApiTest.java wasn't moved then. Fixing the error. Test: atest CtsHiddenApiDiscoveryTestCases The test runs. Change-Id: Idcb1432071552e41611bce298a7ba876edb1be73
diff --git a/tests/signature/api-check/build_signature_apk.mk b/tests/signature/api-check/build_signature_apk.mk index 1bae842..8eb8795 100644 --- a/tests/signature/api-check/build_signature_apk.mk +++ b/tests/signature/api-check/build_signature_apk.mk
@@ -30,7 +30,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := cts-api-signature-test -LOCAL_JNI_SHARED_LIBRARIES := libclassdescriptors +LOCAL_JNI_SHARED_LIBRARIES += libclassdescriptors LOCAL_MULTILIB := both LOCAL_ADDITIONAL_DEPENDENCIES += \
diff --git a/tests/signature/api-check/hidden-api/Android.mk b/tests/signature/api-check/hidden-api/Android.mk index 25df1bc..a5bc737 100644 --- a/tests/signature/api-check/hidden-api/Android.mk +++ b/tests/signature/api-check/hidden-api/Android.mk
@@ -36,8 +36,6 @@ include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := CtsHiddenApiDiscoveryTestCases LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) -LOCAL_MULTILIB := both LOCAL_SIGNATURE_API_FILES := blacklist.api LOCAL_JNI_SHARED_LIBRARIES := libcts_hiddenapi -LOCAL_NDK_STL_VARIANT := c++_static include $(LOCAL_PATH)/../build_signature_apk.mk
diff --git a/tests/signature/api-check/src/android/signature/cts/api/HiddenApiTest.java b/tests/signature/api-check/src/java/android/signature/cts/api/HiddenApiTest.java similarity index 100% rename from tests/signature/api-check/src/android/signature/cts/api/HiddenApiTest.java rename to tests/signature/api-check/src/java/android/signature/cts/api/HiddenApiTest.java