diff options
| author | Jaewoong Jung <jungjw@google.com> | 2019-08-29 00:55:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-08-29 00:55:14 +0000 |
| commit | 7ca557690524d2f02543679eaa6e2f2ff50cc344 (patch) | |
| tree | c6b3a60ce43bb91ac60a57d72d18fe63e19e6bb3 /java/java_test.go | |
| parent | a9caf47ea23ab2696a2e51668ca9112a2b435ec0 (diff) | |
| parent | b28eb5fdcbcb801be92b238b6a22e1be58245e44 (diff) | |
Merge changes Ife12ba69,Ibf910262
* changes:
Implement android_test_import
AndroidMkEntries minor refactoring.
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 5fcdf9670..c55e32553 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -66,6 +66,7 @@ func testContext(bp string, fs map[string][]byte) *android.TestContext { ctx.RegisterModuleType("android_library", android.ModuleFactoryAdaptor(AndroidLibraryFactory)) ctx.RegisterModuleType("android_test", android.ModuleFactoryAdaptor(AndroidTestFactory)) ctx.RegisterModuleType("android_test_helper_app", android.ModuleFactoryAdaptor(AndroidTestHelperAppFactory)) + ctx.RegisterModuleType("android_test_import", android.ModuleFactoryAdaptor(AndroidTestImportFactory)) ctx.RegisterModuleType("java_binary", android.ModuleFactoryAdaptor(BinaryFactory)) ctx.RegisterModuleType("java_binary_host", android.ModuleFactoryAdaptor(BinaryHostFactory)) ctx.RegisterModuleType("java_device_for_host", android.ModuleFactoryAdaptor(DeviceForHostFactory)) @@ -200,6 +201,8 @@ func testContext(bp string, fs map[string][]byte) *android.TestContext { "cert/new_cert.x509.pem": nil, "cert/new_cert.pk8": nil, + + "testdata/data": nil, } for k, v := range fs { |