diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-02-20 16:52:48 -0800 |
|---|---|---|
| committer | Sasha Smundak <asmundak@google.com> | 2019-03-07 16:14:00 -0800 |
| commit | b6aca11e8078b4a93da1c09c94b4d0d7ba0befef (patch) | |
| tree | 5e9ad0c8f23a127ff116cbd4adf1b72d1fe1bbe5 /tests/CoreTests | |
| parent | 10c573ff852309894b383ae9aa13dca0d64f8d3e (diff) | |
Convert tests/**/Android.mk files to Android.bp
See build/soong/README.md for more information.
Note: tests/ImfTest/Android.mk causes conflict as it hasn't been yet
ported to internal master. Do it later.
Note: the conversion in the following directories has to be done in the
internal master first because of the conflicts:
* tests/ActivityManagerPerfTests
* tests/AppLaunch
* tests/AppLaunchWear
* tests/BackgroundDexOptServiceIntegrationTests
* tests/Camera2Tests/CameraToo
* tests/Camera2Tests/SmartCamera/SimpleCamera
* tests/Compatibility
* tests/Internal
* tests/RcsTests
* tests/ServiceCrashTest
* tests/UsbTests
Bug: 122332340
Test: treehugger
Change-Id: Ie17590c6a96aee5caa80d38092a3de5c1b6efe8d
Diffstat (limited to 'tests/CoreTests')
| -rw-r--r-- | tests/CoreTests/Android.mk | 2 | ||||
| -rw-r--r-- | tests/CoreTests/android/Android.bp | 11 | ||||
| -rw-r--r-- | tests/CoreTests/android/Android.mk | 20 |
3 files changed, 11 insertions, 22 deletions
diff --git a/tests/CoreTests/Android.mk b/tests/CoreTests/Android.mk deleted file mode 100644 index 833843220098..000000000000 --- a/tests/CoreTests/Android.mk +++ /dev/null @@ -1,2 +0,0 @@ -include $(call all-subdir-makefiles) - diff --git a/tests/CoreTests/android/Android.bp b/tests/CoreTests/android/Android.bp new file mode 100644 index 000000000000..24134e8fb7f0 --- /dev/null +++ b/tests/CoreTests/android/Android.bp @@ -0,0 +1,11 @@ +android_test { + name: "LegacyCoreTests", + srcs: ["**/*.java"], + libs: [ + "android.test.runner.stubs", + "org.apache.http.legacy", + "android.test.base.stubs", + ], + sdk_version: "current", + static_libs: ["junit"], +} diff --git a/tests/CoreTests/android/Android.mk b/tests/CoreTests/android/Android.mk deleted file mode 100644 index 04f6739a6ced..000000000000 --- a/tests/CoreTests/android/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := \ - $(call all-subdir-java-files) - -LOCAL_JAVA_LIBRARIES := \ - android.test.runner.stubs \ - org.apache.http.legacy \ - android.test.base.stubs \ - -LOCAL_SDK_VERSION := current - -LOCAL_STATIC_JAVA_LIBRARIES := junit - -LOCAL_PACKAGE_NAME := LegacyCoreTests - -include $(BUILD_PACKAGE) |