diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-03-10 19:48:23 -0700 |
|---|---|---|
| committer | Sasha Smundak <asmundak@google.com> | 2019-03-12 09:37:32 -0700 |
| commit | 89414e1ed5a0d22869ac71b9c9b99421f67ab83d (patch) | |
| tree | ac7ef18cb08e6c1b45aba23cf271b10c4d034399 /tests/Internal | |
| parent | e756f460d028794a265494e0619db02e6905676a (diff) | |
Convert tests/**/Android.mk files to Android.bp, part II
See build/soong/README.md for more information.
Bug: 122332340
Test: treehugger
Change-Id: I886b6536a0ef1c8d21f15ec7ff9fdb9784d5b865
Diffstat (limited to 'tests/Internal')
| -rw-r--r-- | tests/Internal/Android.bp | 18 | ||||
| -rw-r--r-- | tests/Internal/Android.mk | 24 |
2 files changed, 18 insertions, 24 deletions
diff --git a/tests/Internal/Android.bp b/tests/Internal/Android.bp new file mode 100644 index 000000000000..4cb9f8d5e1e6 --- /dev/null +++ b/tests/Internal/Android.bp @@ -0,0 +1,18 @@ +android_test { + name: "InternalTests", + proto: { + type: "nano", + }, + // Include some source files directly to be able to access package members + srcs: ["src/**/*.java"], + libs: ["android.test.runner"], + static_libs: [ + "junit", + "androidx.test.rules", + "mockito-target-minus-junit4", + ], + java_resource_dirs: ["res"], + certificate: "platform", + platform_apis: true, + test_suites: ["device-tests"], +} diff --git a/tests/Internal/Android.mk b/tests/Internal/Android.mk deleted file mode 100644 index 2e26ef103794..000000000000 --- a/tests/Internal/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true -LOCAL_MODULE_TAGS := tests - -LOCAL_PROTOC_OPTIMIZE_TYPE := nano - -# Include some source files directly to be able to access package members -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := junit \ - androidx.test.rules \ - mockito-target-minus-junit4 - -LOCAL_JAVA_RESOURCE_DIRS := res -LOCAL_CERTIFICATE := platform - -LOCAL_PACKAGE_NAME := InternalTests -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_COMPATIBILITY_SUITE := device-tests - -include $(BUILD_PACKAGE) |