summaryrefslogtreecommitdiff
path: root/java/app_test.go
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-11-17 02:14:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-11-17 02:14:32 +0000
commit8aceb7e9343807825de0a7b0234989fcf40ab3d1 (patch)
treeec8dfdf8513876847f39df6c8cd86b061b932569 /java/app_test.go
parenta8dff4e7502e8fae19c4618adee025a33a004593 (diff)
parentdf9cd7e41067b21a5326845bb32935fa9aaeeb46 (diff)
Merge "Update platform_apis error message" am: a7f0c39214 am: 2cfe9c9686 am: df9cd7e410
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893228 Change-Id: If72dfb83b101e3b2baf81747c793d7a10e4f492d
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 07439fcd0..0aae9280d 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"],