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.
@@ -133,20 +130,18 @@ var (
 		sdkVersion: "current",
 	})
 	apiScopeSystem = initApiScope(&apiScope{
-		name:                      "system",
+		name:           "system",
-		apiFilePrefix:             "system-",
+		apiFilePrefix:  "system-",
-		moduleSuffix:              sdkSystemApiSuffix,
+		moduleSuffix:   sdkSystemApiSuffix,
-		apiFileMakeVariableSuffix: "_SYSTEM",
+		sdkVersion:     "system_current",
-		sdkVersion:                "system_current",
+		droidstubsArgs: []string{"-showAnnotation android.annotation.SystemApi"},
-		droidstubsArgs:            []string{"-showAnnotation android.annotation.SystemApi"},
 	})
 	apiScopeTest = initApiScope(&apiScope{
-		name:                      "test",
+		name:           "test",
-		apiFilePrefix:             "test-",
+		apiFilePrefix:  "test-",
-		moduleSuffix:              sdkTestApiSuffix,
+		moduleSuffix:   sdkTestApiSuffix,
-		apiFileMakeVariableSuffix: "_TEST",
+		sdkVersion:     "test_current",
-		sdkVersion:                "test_current",
+		droidstubsArgs: []string{"-showAnnotation android.annotation.TestApi"},
-		droidstubsArgs:            []string{"-showAnnotation android.annotation.TestApi"},
 	})
 	allApiScopes = apiScopes{
 		apiScopePublic,