diff options
| author | Jaewoong Jung <jungjw@google.com> | 2019-05-02 07:15:42 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-02 07:15:42 -0700 |
| commit | 212106a722629e4e0ffa02b59ca1fc3ed505fc12 (patch) | |
| tree | e9dcb5f967a0c9551cd2555dc93209b41d116ea7 /java/java_test.go | |
| parent | 6128ec2dc14aaaf7ae28d06d3c5cf7cc99da8cee (diff) | |
| parent | 5fa44dfb043c7375efca74cbb50c19f1c5eec8ae (diff) | |
Merge "Add android_app_import." am: e7d52c779f
am: 5fa44dfb04
Change-Id: I1ec1d30fe592f1997f41eb66f1ad85d9b2b4abeb
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/java_test.go b/java/java_test.go index e18008910..0cbcb887c 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -63,6 +63,7 @@ func testContext(config android.Config, bp string, ctx := android.NewTestArchContext() ctx.RegisterModuleType("android_app", android.ModuleFactoryAdaptor(AndroidAppFactory)) ctx.RegisterModuleType("android_app_certificate", android.ModuleFactoryAdaptor(AndroidAppCertificateFactory)) + ctx.RegisterModuleType("android_app_import", android.ModuleFactoryAdaptor(AndroidAppImportFactory)) ctx.RegisterModuleType("android_library", android.ModuleFactoryAdaptor(AndroidLibraryFactory)) ctx.RegisterModuleType("android_test", android.ModuleFactoryAdaptor(AndroidTestFactory)) ctx.RegisterModuleType("android_test_helper_app", android.ModuleFactoryAdaptor(AndroidTestHelperAppFactory)) @@ -163,6 +164,8 @@ func testContext(config android.Config, bp string, "prebuilts/sdk/tools/core-lambda-stubs.jar": nil, "prebuilts/sdk/Android.bp": []byte(`prebuilt_apis { name: "sdk", api_dirs: ["14", "28", "current"],}`), + "prebuilts/apk/app.apk": nil, + // For framework-res, which is an implicit dependency for framework "AndroidManifest.xml": nil, "build/make/target/product/security/testkey": nil, |