diff options
| author | Colin Cross <ccross@android.com> | 2016-12-09 01:52:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-12-09 01:52:28 +0000 |
| commit | 6c1f37b1da767e6bb52ee11cb8efc790a2fcca6d (patch) | |
| tree | 90a756f169d2cd4247bb003e49f0cdbc3e76ff85 | |
| parent | 8b9bba54a58e584922cbbc5f92b390a34d992c98 (diff) | |
| parent | d0b69265be3a9f8ba547118608ac42b5b85a8826 (diff) | |
| download | llvm-6c1f37b1da767e6bb52ee11cb8efc790a2fcca6d.tar.gz | |
Merge "Move FORCE_BUILD_LLVM_COMPONENTS to a defaults module"
| -rw-r--r-- | Android.bp | 13 | ||||
| -rw-r--r-- | soong/llvm.go | 12 |
2 files changed, 17 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp index 3bdf21279e89..edfd192883fb 100644 --- a/Android.bp +++ b/Android.bp @@ -102,6 +102,12 @@ llvm_tblgen { outs: ["llvm/IR/Intrinsics.gen"], } +force_build_llvm_components_defaults { + name: "force_build_llvm_components", + // Host build disabled by soong/llvm.go unless FORCE_BUILD_LLVM_COMPONENTS + // environment variable is set +} + // LLVM shared library build llvm_arm_static_libraries = [ @@ -142,10 +148,13 @@ llvm_aarch64_static_libraries = [ "libLLVMAArch64Disassembler", ] -llvm_cc_library_shared { +cc_library_shared { host_supported: true, name: "libLLVM", - defaults: ["llvm-defaults"], + defaults: [ + "llvm-defaults", + "force_build_llvm_components", + ], whole_static_libs: [ // pre static libraries diff --git a/soong/llvm.go b/soong/llvm.go index 37a71ed2f8e9..ac096e6ff452 100644 --- a/soong/llvm.go +++ b/soong/llvm.go @@ -82,7 +82,7 @@ func llvmDefaults(ctx android.LoadHookContext) { ctx.AppendProperties(p) } -func llvmLibrary(ctx android.LoadHookContext) { +func forceBuildLlvmComponents(ctx android.LoadHookContext) { if !ctx.AConfig().IsEnvTrue("FORCE_BUILD_LLVM_COMPONENTS") { type props struct { Target struct { @@ -99,7 +99,7 @@ func llvmLibrary(ctx android.LoadHookContext) { func init() { android.RegisterModuleType("llvm_defaults", llvmDefaultsFactory) - android.RegisterModuleType("llvm_cc_library_shared", llvmSharedLibraryFactory) + android.RegisterModuleType("force_build_llvm_components_defaults", forceBuildLlvmComponentsDefaultsFactory) } func llvmDefaultsFactory() (blueprint.Module, []interface{}) { @@ -109,8 +109,8 @@ func llvmDefaultsFactory() (blueprint.Module, []interface{}) { return module, props } -func llvmSharedLibraryFactory() (blueprint.Module, []interface{}) { - module, _ := cc.NewLibrary(android.HostAndDeviceSupported, true, false) - android.AddLoadHook(module, llvmLibrary) - return module.Init() +func forceBuildLlvmComponentsDefaultsFactory() (blueprint.Module, []interface{}) { + module, props := cc.DefaultsFactory() + android.AddLoadHook(module, forceBuildLlvmComponents) + return module, props } |