diff options
| author | Colin Cross <ccross@android.com> | 2017-11-30 20:38:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-30 20:38:15 +0000 |
| commit | 85c87cef014bd4369af347ab8a108c0549d569d9 (patch) | |
| tree | 686f57bc265507d0fd7d991847058362f953d8a7 /java/java_test.go | |
| parent | 7b6d9b956d11380a8eb5c20cb51b2205f847ab52 (diff) | |
| parent | 5ab4e6d817cc1eec81e7fa3ae9d547a0ba94919c (diff) | |
Merge "Allow building framework.jar and framework-res.apk"
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/java/java_test.go b/java/java_test.go index cf5047bbe..0a9eba94d 100644 --- a/java/java_test.go +++ b/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", @@ -134,6 +141,10 @@ func testJavaWithEnvFs(t *testing.T, bp string, "prebuilts/sdk/system_current/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 { |