diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-03-26 15:08:33 -0700 |
|---|---|---|
| committer | Sasha Smundak <asmundak@google.com> | 2019-03-26 15:18:41 -0700 |
| commit | b61bab6a583495f08233b27664849795f3511536 (patch) | |
| tree | 93bb884b82b110895570e0d7e4849d3678d9ade6 /location/tests | |
| parent | 78a39b46279ed26746e8e5504244dda338f424bf (diff) | |
Convert Android.mk file to Android.bp
Files failing automerge from AOSP.
See build/soong/README.md for more information.
Bug: 122332340
Test: treehugger
Change-Id: I92f7584aeaf502336f67e04fbc22634784c9305d
Diffstat (limited to 'location/tests')
| -rw-r--r-- | location/tests/Android.bp | 1 | ||||
| -rw-r--r-- | location/tests/Android.mk | 3 | ||||
| -rw-r--r-- | location/tests/locationtests/Android.bp | 19 | ||||
| -rw-r--r-- | location/tests/locationtests/Android.mk | 23 |
4 files changed, 20 insertions, 26 deletions
diff --git a/location/tests/Android.bp b/location/tests/Android.bp new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/location/tests/Android.bp @@ -0,0 +1 @@ + diff --git a/location/tests/Android.mk b/location/tests/Android.mk deleted file mode 100644 index 57848f353fd4..000000000000 --- a/location/tests/Android.mk +++ /dev/null @@ -1,3 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(call all-makefiles-under, $(LOCAL_PATH))
\ No newline at end of file diff --git a/location/tests/locationtests/Android.bp b/location/tests/locationtests/Android.bp new file mode 100644 index 000000000000..1a4e2c7ba355 --- /dev/null +++ b/location/tests/locationtests/Android.bp @@ -0,0 +1,19 @@ +android_test { + name: "FrameworksLocationTests", + // Include all test java files. + srcs: ["src/**/*.java"], + libs: [ + "android.test.runner", + "android.test.base", + ], + platform_apis: true, + static_libs: [ + "androidx.test.rules", + "core-test-rules", + "guava", + "mockito-target-minus-junit4", + "frameworks-base-testutils", + "truth-prebuilt", + ], + test_suites: ["device-tests"], +} diff --git a/location/tests/locationtests/Android.mk b/location/tests/locationtests/Android.mk deleted file mode 100644 index 3dcf69426362..000000000000 --- a/location/tests/locationtests/Android.mk +++ /dev/null @@ -1,23 +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 android.test.base -LOCAL_PACKAGE_NAME := FrameworksLocationTests -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_STATIC_JAVA_LIBRARIES := \ - androidx.test.rules \ - core-test-rules \ - guava \ - mockito-target-minus-junit4 \ - frameworks-base-testutils \ - truth-prebuilt \ - -LOCAL_COMPATIBILITY_SUITE := device-tests -include $(BUILD_PACKAGE) |