From 2ad817c65d80d2ab4b9cb851cff8d8c3982b663d Mon Sep 17 00:00:00 2001 From: Jaewoong Jung Date: Fri, 18 Jan 2019 14:27:16 -0800 Subject: Enable certificate overrides with product vars. Currently it is only for android_app, though it can be easily ported to apex. The make-side change will be made later, along with a real application. Bug: 122957760 Test: app_test.go Change-Id: I41f0be84f8b9f93e9518a16160e10eaa649388cd --- java/java_test.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index a0d962e3e..a0b8952c4 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -71,6 +71,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_library", android.ModuleFactoryAdaptor(AndroidLibraryFactory)) ctx.RegisterModuleType("android_test", android.ModuleFactoryAdaptor(AndroidTestFactory)) ctx.RegisterModuleType("android_test_helper_app", android.ModuleFactoryAdaptor(AndroidTestHelperAppFactory)) @@ -226,6 +227,9 @@ func testContext(config android.Config, bp string, "bar-doc/IFoo.aidl": nil, "bar-doc/known_oj_tags.txt": nil, "external/doclava/templates-sdk": nil, + + "cert/new_cert.x509.pem": nil, + "cert/new_cert.pk8": nil, } for k, v := range fs { -- cgit v1.2.3-59-g8ed1b