summaryrefslogtreecommitdiff
path: root/java/sdk_library_test.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2021-06-01 14:07:56 -0700
committerColin Cross <ccross@android.com>2021-06-08 10:17:58 -0700
commit1072a710898e90227dbc2664274aa5539acbaa51 (patch)
treeec62e78e3baceb4fb8b5d280794d95151d929fac /java/sdk_library_test.go
parent0f9eeb753d738ab420653eaff31bf6f01424d718 (diff)
Ignore owner property when computing java_sdk_library dist subdirectory
The owner property is no longer used, the dist subdirectory is determined by the dist_group property. Bug: 186723288 Test: TestJavaSdkLibraryDist Change-Id: Id6d997eef05f6511070677974219674f248cb754 Merged-In: Id6d997eef05f6511070677974219674f248cb754 (cherry picked from commit 59b92bfdb300d93558d685e9ea9f4cb5c7378a3b)
Diffstat (limited to 'java/sdk_library_test.go')
-rw-r--r--java/sdk_library_test.go9
1 files changed, 5 insertions, 4 deletions
diff --git a/java/sdk_library_test.go b/java/sdk_library_test.go
index f0f3a197f..fe21a20d0 100644
--- a/java/sdk_library_test.go
+++ b/java/sdk_library_test.go
@@ -846,7 +846,7 @@ func TestJavaSdkLibraryDist(t *testing.T) {
PrepareForTestWithJavaSdkLibraryFiles,
).RunTestWithBp(t, `
java_sdk_library {
- name: "sdklib_no_owner",
+ name: "sdklib_no_group",
unsafe_ignore_missing_latest_api: true,
srcs: ["foo.java"],
}
@@ -887,9 +887,9 @@ func TestJavaSdkLibraryDist(t *testing.T) {
}
testCases := []testCase{
{
- module: "sdklib_no_owner",
+ module: "sdklib_no_group",
distDir: "apistubs/unknown/public",
- distStem: "sdklib_no_owner.jar",
+ distStem: "sdklib_no_group.jar",
},
{
module: "sdklib_group_foo",
@@ -897,8 +897,9 @@ func TestJavaSdkLibraryDist(t *testing.T) {
distStem: "sdklib_group_foo.jar",
},
{
+ // Owner doesn't affect distDir after b/186723288.
module: "sdklib_owner_foo",
- distDir: "apistubs/foo/public",
+ distDir: "apistubs/unknown/public",
distStem: "sdklib_owner_foo.jar",
},
{