StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove core_lib property from java_sdk_library

Browse Source 
Its not used, remove it.

Bug: 186723288
Test: TestJavaSdkLibraryDist
Change-Id: I1689b670a8ae6a614e5e4ec5e79cb5e283b2e277
Merged-In: I1689b670a8ae6a614e5e4ec5e79cb5e283b2e277
(cherry picked from commit f0eace9eed)
This commit is contained in:
Colin Cross
2021-06-02 13:02:23 -07:00
parent 1072a71089
commit ea0e69897e
2 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/sdk_library.go
View File

@@ -435,9 +435,6 @@ type sdkLibraryProperties struct {
// a list of top-level directories containing Java stub files to merge show/hide annotations from. // a list of top-level directories containing Java stub files to merge show/hide annotations from.
Merge_inclusion_annotations_dirs []string Merge_inclusion_annotations_dirs []string
// If set to true, the path of dist files is apistubs/core. Defaults to false.
Core_lib *bool
// If set to true then don't create dist rules. // If set to true then don't create dist rules.
No_dist *bool No_dist *bool
@@ -1203,11 +1200,7 @@ func (module *SdkLibrary) AndroidMkEntries() []android.AndroidMkEntries {
// The dist path of the stub artifacts // The dist path of the stub artifacts
func (module *SdkLibrary) apiDistPath(apiScope *apiScope) string { func (module *SdkLibrary) apiDistPath(apiScope *apiScope) string {
if Bool(module.sdkLibraryProperties.Core_lib) { return path.Join("apistubs", module.distGroup(), apiScope.name)
return path.Join("apistubs", "core", apiScope.name)
} else {
return path.Join("apistubs", module.distGroup(), apiScope.name)
}
} }
// Get the sdk version for use when compiling the stubs library. // Get the sdk version for use when compiling the stubs library.

12
java/sdk_library_test.go
View File

@@ -871,13 +871,6 @@ func TestJavaSdkLibraryDist(t *testing.T) {
srcs: ["foo.java"], srcs: ["foo.java"],
dist_stem: "foo", dist_stem: "foo",
} }
java_sdk_library {
name: "sdklib_core_lib",
unsafe_ignore_missing_latest_api: true,
srcs: ["foo.java"],
core_lib: true,
}
`) `)
type testCase struct { type testCase struct {
@@ -907,11 +900,6 @@ func TestJavaSdkLibraryDist(t *testing.T) {
distDir: "apistubs/unknown/public", distDir: "apistubs/unknown/public",
distStem: "foo.jar", distStem: "foo.jar",
}, },
{
module: "sdklib_core_lib",
distDir: "apistubs/core/public",
distStem: "sdklib_core_lib.jar",
},
} }
for _, tt := range testCases { for _, tt := range testCases {