From 5ab4e6d817cc1eec81e7fa3ae9d547a0ba94919c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 22 Nov 2017 16:20:45 -0800 Subject: Allow building framework.jar and framework-res.apk Update app support enough to build framework-res.apk, link framework.jar against its generated files, and export it to make. Bug: 69917341 Test: m checkbuild tests docs Change-Id: I7db29cd1f5fabb22e844483ecc7c38abfedbbe0a --- java/java_test.go | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'java/java_test.go') 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 { -- cgit v1.2.3-59-g8ed1b