diff options
| author | 2019-04-03 11:42:07 -0700 | |
|---|---|---|
| committer | 2019-04-03 17:28:11 -0700 | |
| commit | e23e5c6edc181256b622b72f0ff7a29fef45d13c (patch) | |
| tree | d9357f621051e299c8d24c461e630680711076af | |
| parent | e6bcf626bea76a103765b603e8c34c3ff49b2800 (diff) | |
Convert core/tests/featureflagtests/Android.mk file to Android.bp
Cherrypick of https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/6924943
See build/soong/README.md for more information.
Bug: 122332340
Test: treehugger
Change-Id: If3f574bc15dedcd7880be605667297d257175c8d
Merged-In: If3f574bc15dedcd7880be605667297d257175c8d
| -rw-r--r-- | core/tests/featureflagtests/Android.bp | 19 | ||||
| -rw-r--r-- | core/tests/featureflagtests/Android.mk | 20 |
2 files changed, 19 insertions, 20 deletions
diff --git a/core/tests/featureflagtests/Android.bp b/core/tests/featureflagtests/Android.bp new file mode 100644 index 000000000000..a910499a7f2e --- /dev/null +++ b/core/tests/featureflagtests/Android.bp @@ -0,0 +1,19 @@ +android_test { + name: "FrameworksCoreFeatureFlagTests", + // We only want this apk build for tests. + // Include all test java files. + srcs: ["src/**/*.java"], + dxflags: ["--core-library"], + static_libs: [ + "android-common", + "frameworks-core-util-lib", + "android-support-test", + ], + libs: [ + "android.test.runner", + "android.test.base", + ], + platform_apis: true, + certificate: "platform", + test_suites: ["device-tests"], +} diff --git a/core/tests/featureflagtests/Android.mk b/core/tests/featureflagtests/Android.mk deleted file mode 100644 index 5e518b60a9ee..000000000000 --- a/core/tests/featureflagtests/Android.mk +++ /dev/null @@ -1,20 +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_DX_FLAGS := --core-library -LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib android-support-test -LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base -LOCAL_PACKAGE_NAME := FrameworksCoreFeatureFlagTests -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_CERTIFICATE := platform -LOCAL_COMPATIBILITY_SUITE := device-tests - -include $(BUILD_PACKAGE) |