From 96548c9ee00ba5b020626c6929e1d57dc2275f15 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 12 Oct 2016 14:26:55 -0700 Subject: [PATCH] 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: I0326d0c88f78edb79eebedb155b69415e351fb61 --- build/art.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build/art.go b/build/art.go index b82653869..1164cbc55 100644 --- a/build/art.go +++ b/build/art.go @@ -15,7 +15,6 @@ package art import ( - "android/soong" "android/soong/android" "android/soong/cc" "fmt" @@ -222,13 +221,13 @@ func testInstall(ctx android.InstallHookContext) { var artTestMutex sync.Mutex func init() { - soong.RegisterModuleType("art_cc_library", artLibrary) - soong.RegisterModuleType("art_cc_binary", artBinary) - soong.RegisterModuleType("art_cc_test", artTest) - soong.RegisterModuleType("art_cc_test_library", artTestLibrary) - soong.RegisterModuleType("art_cc_defaults", artDefaultsFactory) - soong.RegisterModuleType("art_global_defaults", artGlobalDefaultsFactory) - soong.RegisterModuleType("art_debug_defaults", artDebugDefaultsFactory) + android.RegisterModuleType("art_cc_library", artLibrary) + android.RegisterModuleType("art_cc_binary", artBinary) + android.RegisterModuleType("art_cc_test", artTest) + android.RegisterModuleType("art_cc_test_library", artTestLibrary) + android.RegisterModuleType("art_cc_defaults", artDefaultsFactory) + android.RegisterModuleType("art_global_defaults", artGlobalDefaultsFactory) + android.RegisterModuleType("art_debug_defaults", artDebugDefaultsFactory) } func artGlobalDefaultsFactory() (blueprint.Module, []interface{}) { -- 2.11.0