Merge changes from topic "disable_shared_library" into rvc-dev am: 2eb4ace0ef

Change-Id: Idfd63ca9823bfcd4a941bf00df32f125498250db

java/java_test.go

@@ -1157,6 +1157,16 @@ func TestJavaSdkLibrary(t *testing.T) {
 			libs: ["foo", "bar.stubs"],
 			sdk_version: "system_current",
 		}
+		java_sdk_library {
+			name: "barney",
+			srcs: ["c.java"],
+			api_only: true,
+		}
+		java_sdk_library {
+			name: "betty",
+			srcs: ["c.java"],
+			shared_library: false,
+		}
 		java_sdk_library_import {
 		    name: "quuz",
 				public: {
@@ -1169,10 +1179,17 @@ func TestJavaSdkLibrary(t *testing.T) {
 					jars: ["b.jar"],
 				},
 		}
+		java_sdk_library_import {
+		    name: "wilma",
+				public: {
+					jars: ["b.jar"],
+				},
+				shared_library: false,
+		}
 		java_library {
 		    name: "qux",
 		    srcs: ["c.java"],
-		    libs: ["baz", "fred", "quuz.stubs"],
+		    libs: ["baz", "fred", "quuz.stubs", "wilma", "barney", "betty"],
 		    sdk_version: "system_current",
 		}
 		java_library {