diff options
| author | Colin Cross <ccross@android.com> | 2016-10-12 14:28:16 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-10-12 14:30:44 -0700 |
| commit | 798bfce9d00217716eaee2256878db625b9e6e2e (patch) | |
| tree | 80939327c1f981ae0c689c907b37f8fb39334a99 /java | |
| parent | 3f9bde87fb7f7da0ee41ff5674efee6177c88822 (diff) | |
| download | build_soong-798bfce9d00217716eaee2256878db625b9e6e2e.tar.gz build_soong-798bfce9d00217716eaee2256878db625b9e6e2e.tar.bz2 build_soong-798bfce9d00217716eaee2256878db625b9e6e2e.zip | |
Move registration into android packageandroid-n-mr1-preview-2android-n-mr1-preview-1
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
Diffstat (limited to 'java')
| -rw-r--r-- | java/java.go | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/java/java.go b/java/java.go index 315ee499..808e1db3 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: |