From ea0e69897e8ff12c2e788ee16587e643c63fb426 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 2 Jun 2021 13:02:23 -0700
Subject: [PATCH] Remove core_lib property from java_sdk_library

Its not used, remove it.

Bug: 186723288
Test: TestJavaSdkLibraryDist
Change-Id: I1689b670a8ae6a614e5e4ec5e79cb5e283b2e277
Merged-In: I1689b670a8ae6a614e5e4ec5e79cb5e283b2e277
(cherry picked from commit f0eace9eed83c0d7cd06df29379ed7e090bd2c27)
---
 java/sdk_library.go      |  9 +--------
 java/sdk_library_test.go | 12 ------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/java/sdk_library.go b/java/sdk_library.go
index b1c3e5d15..133deda75 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -435,9 +435,6 @@ type sdkLibraryProperties struct {
 	// a list of top-level directories containing Java stub files to merge show/hide annotations from.
 	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.
 	No_dist *bool
 
@@ -1203,11 +1200,7 @@ func (module *SdkLibrary) AndroidMkEntries() []android.AndroidMkEntries {
 
 // The dist path of the stub artifacts
 func (module *SdkLibrary) apiDistPath(apiScope *apiScope) string {
-	if Bool(module.sdkLibraryProperties.Core_lib) {
-		return path.Join("apistubs", "core", apiScope.name)
-	} else {
-		return path.Join("apistubs", module.distGroup(), apiScope.name)
-	}
+	return path.Join("apistubs", module.distGroup(), apiScope.name)
 }
 
 // Get the sdk version for use when compiling the stubs library.
diff --git a/java/sdk_library_test.go b/java/sdk_library_test.go
index fe21a20d0..e051bbe2c 100644
--- a/java/sdk_library_test.go
+++ b/java/sdk_library_test.go
@@ -871,13 +871,6 @@ func TestJavaSdkLibraryDist(t *testing.T) {
 			srcs: ["foo.java"],
 			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 {
@@ -907,11 +900,6 @@ func TestJavaSdkLibraryDist(t *testing.T) {
 			distDir:  "apistubs/unknown/public",
 			distStem: "foo.jar",
 		},
-		{
-			module:   "sdklib_core_lib",
-			distDir:  "apistubs/core/public",
-			distStem: "sdklib_core_lib.jar",
-		},
 	}
 
 	for _, tt := range testCases {