diff options
| author | Jaewoong Jung <jungjw@google.com> | 2019-08-28 18:17:30 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-28 18:17:30 -0700 |
| commit | 6e104c7ee5894417c4019eba0c61482dbc424a30 (patch) | |
| tree | 012092d0ac06db13c2547e802863fea582d723a6 /java/java_test.go | |
| parent | 7e035187e9989c21480d4afc6e1b15d931cd7427 (diff) | |
| parent | 7ca557690524d2f02543679eaa6e2f2ff50cc344 (diff) | |
Merge changes Ife12ba69,Ibf910262
am: 7ca5576905
Change-Id: I4e486be727b3be79afac66644cc3e9967e43bd45
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 6a18e5232..a9323199d 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 { |