Clean up obsolete aliases for Truth. am: 6ff7f878d7 am: 1e11f14332 am: ec2df10b8f am: 82ce8a0d0f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Telephony/+/2778099
Change-Id: I561fdb40789374032c910e1b9044e0ea93790d4c
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/services/QualifiedNetworksService/Android.bp b/services/QualifiedNetworksService/Android.bp
index 80e6d14..5549e74 100644
--- a/services/QualifiedNetworksService/Android.bp
+++ b/services/QualifiedNetworksService/Android.bp
@@ -12,16 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
genrule {
- name: "statslog-qns-java-gen",
- tools: ["stats-log-api-gen"],
- cmd: "$(location stats-log-api-gen) --java $(out) --module qns --javaPackage com.android.telephony.qns.stats --javaClass QnsStatsLog --worksource",
- out: ["com/android/telephony/qns/stats/QnsStatsLog.java"],
+ name: "statslog-qns-java-gen",
+ tools: ["stats-log-api-gen"],
+ cmd: "$(location stats-log-api-gen) --java $(out) --module qns --javaPackage com.android.telephony.qns.stats --javaClass QnsStatsLog --worksource",
+ out: ["com/android/telephony/qns/stats/QnsStatsLog.java"],
}
android_app {
@@ -46,7 +45,7 @@
"ims-common",
"framework-annotations-lib",
"framework-connectivity",
- "framework-wifi"
+ "framework-wifi",
],
plugins: ["auto_value_plugin"],
@@ -73,7 +72,6 @@
system_ext_specific: true,
}
-
android_test {
name: "QualifiedNetworksServiceTests",
manifest: "tests/AndroidManifest.xml",
@@ -88,7 +86,7 @@
"telephony-common",
"ims-common",
"android.test.mock",
- "android.test.base"
+ "android.test.base",
],
static_libs: [
"androidx.appcompat_appcompat",
@@ -100,7 +98,7 @@
"frameworks-base-testutils",
"mockito-target-extended-minus-junit4",
"platform-test-annotations",
- "truth-prebuilt",
+ "truth",
"testables",
"TelephonyStatsLib",
],
@@ -113,4 +111,3 @@
instrumentation_for: "QualifiedNetworksService",
test_suites: ["device-tests"],
}
-
