From fd7310d95af0828df05f70549b5fde2b8c574ec0 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Mon, 10 Jul 2017 12:29:42 -0700
Subject: [PATCH] Fix kernel_headers module registration

This was breaking SANITIZE_TARGET (and likely others)

Test: SANITIZE_TARGET=address m -j nothing
Test: out/soong/build.ninja is identical before/after
Test: out/soong/Android-aosp_arm64.mk is identical before/after
Change-Id: Ic0d6774025761ec9ae9240c109895ab8032e4784
---
 cc/kernel_headers.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cc/kernel_headers.go b/cc/kernel_headers.go
index c66fca68a..42dc7701c 100644
--- a/cc/kernel_headers.go
+++ b/cc/kernel_headers.go
@@ -40,12 +40,9 @@ func kernelHeadersFactory() android.Module {
 		libraryDecorator: library,
 	}
 
-	module.compiler = nil
 	module.linker = stub
-	module.installer = nil
 
-	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibBoth)
-	return module
+	return module.Init()
 }
 
 func init() {