diff options
| author | Colin Cross <ccross@android.com> | 2017-11-22 16:20:45 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-11-29 20:47:42 -0800 |
| commit | 5ab4e6d817cc1eec81e7fa3ae9d547a0ba94919c (patch) | |
| tree | c9b6be84034d1b74a7d42683b520fef38b3145b9 /java/java_test.go | |
| parent | 46029a4131ae035d85c5e60871b5156bfc36e784 (diff) | |
| download | android_build_soong-5ab4e6d817cc1eec81e7fa3ae9d547a0ba94919c.tar.gz android_build_soong-5ab4e6d817cc1eec81e7fa3ae9d547a0ba94919c.tar.bz2 android_build_soong-5ab4e6d817cc1eec81e7fa3ae9d547a0ba94919c.zip | |
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
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 cf5047bb..0a9eba94 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 { |