Merge "Remove obsolete var apiFileMakeVariableSuffix" into rvc-dev

java/sdk_library.go

@@ -83,9 +83,6 @@ type apiScope struct {
 	// module name.
 	moduleSuffix string
 
-	// The suffix to add to the make variable that references the location of the api file.
-	apiFileMakeVariableSuffix string
-
 	// SDK version that the stubs library is built against. Note that this is always
 	// *current. Older stubs library built with a numbered SDK version is created from
 	// the prebuilt jar.
@@ -136,7 +133,6 @@ var (
 		name:           "system",
 		apiFilePrefix:  "system-",
 		moduleSuffix:   sdkSystemApiSuffix,
-		apiFileMakeVariableSuffix: "_SYSTEM",
 		sdkVersion:     "system_current",
 		droidstubsArgs: []string{"-showAnnotation android.annotation.SystemApi"},
 	})
@@ -144,7 +140,6 @@ var (
 		name:           "test",
 		apiFilePrefix:  "test-",
 		moduleSuffix:   sdkTestApiSuffix,
-		apiFileMakeVariableSuffix: "_TEST",
 		sdkVersion:     "test_current",
 		droidstubsArgs: []string{"-showAnnotation android.annotation.TestApi"},
 	})