diff options
author | Krzysztof KosiĆski <krzysio@google.com> | 2023-10-07 07:45:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-07 07:45:13 +0000 |
commit | 597fdab110cef5402f500cf1ee86b7653f03301d (patch) | |
tree | c8f9732aed1c34c7cad0ab78d7ee005b9654de7f | |
parent | 5942c040c15e80f0a5b6fa927929d7443a76bb15 (diff) | |
parent | 1f7eb1aeed5ca900daa67ec5c2aa8ee810f1edc2 (diff) | |
download | connectedappssdk-597fdab110cef5402f500cf1ee86b7653f03301d.tar.gz |
Clean up obsolete aliases for Truth. am: 3575d1e55a am: e0169e0fa9 am: a866f973ff am: 7f7b06f548 am: 1f7eb1aeed
Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2776856
Change-Id: Ifa4cff423e4b8c57a68485fba7f9ed78a796175c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 41 |
1 files changed, 22 insertions, 19 deletions
@@ -5,27 +5,27 @@ package { java_library { name: "ConnectedAppsSDK_Annotations", srcs: [ - "annotations/src/main/java/**/*.java" + "annotations/src/main/java/**/*.java", ], - host_supported: true + host_supported: true, } java_library { name: "ConnectedAppsSDK_Test_Annotations", srcs: [ - "testing/annotations/src/main/java/**/*.java" + "testing/annotations/src/main/java/**/*.java", ], - host_supported: true + host_supported: true, } filegroup { name: "ConnectedAppsSDK_Resources", srcs: [ - "processor/src/main/resources/**/*" + "processor/src/main/resources/**/*", ], - path: "processor/src/main/resources" + path: "processor/src/main/resources", } java_plugin { @@ -40,27 +40,30 @@ java_plugin { "error_prone_annotations", "guava", "ConnectedAppsSDK_Annotations", - "ConnectedAppsSDK_Test_Annotations" + "ConnectedAppsSDK_Test_Annotations", ], srcs: [ - "processor/src/main/java/**/*.java" + "processor/src/main/java/**/*.java", ], java_resources: [ - ":ConnectedAppsSDK_Resources" + ":ConnectedAppsSDK_Resources", + ], + plugins: [ + "auto_service_plugin", + "auto_value_plugin", ], - plugins: ["auto_service_plugin", "auto_value_plugin"], generates_api: true, - use_tools_jar: true + use_tools_jar: true, } filegroup { name: "ConnectedAppsSDK_AIDL", srcs: [ - "sdk/src/main/aidl/**/*.aidl" + "sdk/src/main/aidl/**/*.aidl", ], - path: "sdk/src/main/aidl" + path: "sdk/src/main/aidl", } android_library { @@ -68,7 +71,7 @@ android_library { sdk_version: "test_current", srcs: [ "sdk/src/main/java/**/*.java", - ":ConnectedAppsSDK_AIDL" + ":ConnectedAppsSDK_AIDL", ], static_libs: [ "ConnectedAppsSDK_Annotations", @@ -97,7 +100,7 @@ android_library { name: "ConnectedAppsSDK_SharedTestApp", sdk_version: "test_current", srcs: [ - "tests/shared/src/main/java/**/*.java" + "tests/shared/src/main/java/**/*.java", ], manifest: "tests/shared/src/main/AndroidManifest.xml", min_sdk_version: "28", @@ -105,7 +108,7 @@ android_library { "ConnectedAppsSDK_Annotations", "ConnectedAppsSDK", "guava", - "truth-prebuilt" + "truth", ], plugins: ["ConnectedAppsSDK_Processor"], } @@ -114,7 +117,7 @@ android_library { android_test { name: "ConnectedAppsSDKTest", srcs: [ - "tests/instrumented/src/main/java/**/*.java" + "tests/instrumented/src/main/java/**/*.java", ], test_suites: [ "general-tests", @@ -126,9 +129,9 @@ android_test { "ConnectedAppsSDK_Testing", "androidx.test.ext.junit", "ctstestrunner-axt", - "truth-prebuilt", + "truth", "testng", // for assertThrows ], manifest: "tests/instrumented/src/AndroidManifest.xml", - min_sdk_version: "28" + min_sdk_version: "28", } |