Merge "Allow building framework.jar and framework-res.apk" am: 85c87cef01 am: 2fc6f692d1

am: 5f3053a307

Change-Id: Id93733384a0c3636098d457bc22a474da67561d1

java/java_test.go

@@ -97,6 +97,13 @@ func testJavaWithEnvFs(t *testing.T, bp string,
 		`, extra)
 	}
 
+	bp += `
+		android_app {
+			name: "framework-res",
+			no_framework_libs: true,
+		}
+	`
+
 	if config.TargetOpenJDK9() {
 		systemModules := []string{
 			"core-system-modules",
@@ -136,6 +143,10 @@ func testJavaWithEnvFs(t *testing.T, bp string,
 		"prebuilts/sdk/system_14/framework.aidl":      nil,
 		"prebuilts/sdk/test_current/android.jar":      nil,
 		"prebuilts/sdk/test_current/framework.aidl":   nil,
+
+		// For framework-res, which is an implicit dependency for framework
+		"AndroidManifest.xml":                   nil,
+		"build/target/product/security/testkey": nil,
 	}
 
 	for k, v := range fs {