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/FrameworkPerf | |
| 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/FrameworkPerf')
| -rw-r--r-- | tests/FrameworkPerf/Android.bp | 14 | ||||
| -rw-r--r-- | tests/FrameworkPerf/Android.mk | 16 |
2 files changed, 14 insertions, 16 deletions
diff --git a/tests/FrameworkPerf/Android.bp b/tests/FrameworkPerf/Android.bp new file mode 100644 index 000000000000..a259ebd05fa8 --- /dev/null +++ b/tests/FrameworkPerf/Android.bp @@ -0,0 +1,14 @@ +android_test { + name: "FrameworkPerf", + srcs: ["**/*.java"], + platform_apis: true, + libs: [ + "android.test.runner", + "android.test.base", + ], + static_libs: ["junit"], + aaptflags: [ + "-c", + "120dpi,240dpi,160dpi,161dpi,320dpi,nodpi", + ], +} diff --git a/tests/FrameworkPerf/Android.mk b/tests/FrameworkPerf/Android.mk deleted file mode 100644 index 0664d4d46253..000000000000 --- a/tests/FrameworkPerf/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := FrameworkPerf -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base -LOCAL_STATIC_JAVA_LIBRARIES := junit - -LOCAL_AAPT_FLAGS = -c 120dpi,240dpi,160dpi,161dpi,320dpi,nodpi - -include $(BUILD_PACKAGE) |