summaryrefslogtreecommitdiff
path: root/java/app_test.go
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-11-17 02:26:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-11-17 02:26:42 +0000
commited844768754cc13cab59f334793747bd60ac5ed3 (patch)
tree1d7856701fedb67cb39535bd3c669adbdccd7330 /java/app_test.go
parentc95f6fc34305d99c45ba60f118d3eab40e0e43ce (diff)
parent8aceb7e9343807825de0a7b0234989fcf40ab3d1 (diff)
Merge "Update platform_apis error message" am: a7f0c39214 am: 2cfe9c9686 am: df9cd7e410 am: 8aceb7e934
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893228 Change-Id: I84cbfab1b04c0660b3d4c3a6b227e70b290090c5
Diffstat (limited to 'java/app_test.go')
-rw-r--r--java/app_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/app_test.go b/java/app_test.go
index 349c1b5f2..a6bb04baf 100644
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -144,14 +144,14 @@ func TestPlatformAPIs(t *testing.T) {
}
`)
- testJavaError(t, "platform_apis must be true when sdk_version is empty.", `
+ testJavaError(t, "This module has conflicting settings. sdk_version is empty, which means that this module is build against platform APIs. However platform_apis is not set to true", `
android_app {
name: "bar",
srcs: ["b.java"],
}
`)
- testJavaError(t, "platform_apis must be false when sdk_version is not empty.", `
+ testJavaError(t, "This module has conflicting settings. sdk_version is not empty, which means this module cannot use platform APIs. However platform_apis is set to true.", `
android_app {
name: "bar",
srcs: ["b.java"],