StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ife12ba69,Ibf910262

Browse Source 
am: 7ca5576905

Change-Id: I4e486be727b3be79afac66644cc3e9967e43bd45
This commit is contained in:
Jaewoong Jung
2019-08-28 18:17:30 -07:00
committed by android-build-merger
parent 7e035187e9 7ca5576905
commit 6e104c7ee5
9 changed files with 155 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/java_test.go
View File

@@ -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 {