diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-03-09 08:25:50 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-09 08:25:50 -0800 |
| commit | ba36f89d7f774881bf97c55725cab07441934acd (patch) | |
| tree | a52c970698cd702168a9e44dfce2724d7193f45e /tests/permission | |
| parent | 4509929509d47ee06dc171a1ad152549b3599708 (diff) | |
| parent | c15ff1558741affaf1254dc89bfa1d190e2c6576 (diff) | |
Merge "Convert tests/**/Android.mk files to Android.bp" am: 40ff4f7d83 am: c33506ce2f
am: c15ff15587
Change-Id: I55c5f273e09a2a0ad53fdd8cb4860f04207c4241
Diffstat (limited to 'tests/permission')
| -rw-r--r-- | tests/permission/Android.bp | 12 | ||||
| -rw-r--r-- | tests/permission/Android.mk | 16 |
2 files changed, 12 insertions, 16 deletions
diff --git a/tests/permission/Android.bp b/tests/permission/Android.bp new file mode 100644 index 000000000000..bd07009de7b3 --- /dev/null +++ b/tests/permission/Android.bp @@ -0,0 +1,12 @@ +android_test { + name: "FrameworkPermissionTests", + // Include all test java files. + srcs: ["src/**/*.java"], + libs: [ + "android.test.runner", + "telephony-common", + "android.test.base", + ], + static_libs: ["junit"], + platform_apis: true, +} diff --git a/tests/permission/Android.mk b/tests/permission/Android.mk deleted file mode 100644 index dd2f3ec46d26..000000000000 --- a/tests/permission/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# We only want this apk build for tests. -LOCAL_MODULE_TAGS := tests - -# Include all test java files. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common android.test.base -LOCAL_STATIC_JAVA_LIBRARIES := junit -LOCAL_PACKAGE_NAME := FrameworkPermissionTests -LOCAL_PRIVATE_PLATFORM_APIS := true - -include $(BUILD_PACKAGE) - |