From 798bfce9d00217716eaee2256878db625b9e6e2e Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 12 Oct 2016 14:28:16 -0700 Subject: Move registration into android package Mutator registration is tightly coupled with the android package, move all registration from the soong package to the android package. Test: build.ninja identical Change-Id: Ie183d0b52cc7431c9e05b231934d189208ef1efe --- java/java.go | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 315ee499b..808e1db32 100644 --- a/java/java.go +++ b/java/java.go @@ -24,22 +24,21 @@ import ( "github.com/google/blueprint" - "android/soong" "android/soong/android" "android/soong/genrule" ) func init() { - soong.RegisterModuleType("java_library", JavaLibraryFactory) - soong.RegisterModuleType("java_library_static", JavaLibraryFactory) - soong.RegisterModuleType("java_library_host", JavaLibraryHostFactory) - soong.RegisterModuleType("java_binary", JavaBinaryFactory) - soong.RegisterModuleType("java_binary_host", JavaBinaryHostFactory) - soong.RegisterModuleType("prebuilt_java_library", JavaPrebuiltFactory) - soong.RegisterModuleType("prebuilt_sdk", SdkPrebuiltFactory) - soong.RegisterModuleType("android_app", AndroidAppFactory) - - soong.RegisterSingletonType("logtags", LogtagsSingleton) + android.RegisterModuleType("java_library", JavaLibraryFactory) + android.RegisterModuleType("java_library_static", JavaLibraryFactory) + android.RegisterModuleType("java_library_host", JavaLibraryHostFactory) + android.RegisterModuleType("java_binary", JavaBinaryFactory) + android.RegisterModuleType("java_binary_host", JavaBinaryHostFactory) + android.RegisterModuleType("prebuilt_java_library", JavaPrebuiltFactory) + android.RegisterModuleType("prebuilt_sdk", SdkPrebuiltFactory) + android.RegisterModuleType("android_app", AndroidAppFactory) + + android.RegisterSingletonType("logtags", LogtagsSingleton) } // TODO: -- cgit v1.2.3-59-g8ed1b