Fix ndk_library following decorator refactor.
https://android-review.googlesource.com/#/c/253603/ accidentally
dropped the ndk_library properties and was using the base cc
properties instead.
Change-Id: Ia2dcd767f98871dbdbbd9d0ff6d2a73b9b4889ac
diff --git a/cc/ndk_library.go b/cc/ndk_library.go
index 85c2092..fe52b0e 100644
--- a/cc/ndk_library.go
+++ b/cc/ndk_library.go
@@ -265,7 +265,7 @@
stub.installPath = ctx.InstallFile(installDir, path).String()
}
-func newStubLibrary() *Module {
+func newStubLibrary() (*Module, []interface{}) {
module, library := NewLibrary(android.DeviceSupported, true, false)
module.stl = nil
module.sanitize = nil
@@ -278,10 +278,11 @@
module.linker = stub
module.installer = stub
- return module
+ return module, []interface{}{&stub.properties}
}
func ndkLibraryFactory() (blueprint.Module, []interface{}) {
- module := newStubLibrary()
- return module.Init()
+ module, properties := newStubLibrary()
+ return android.InitAndroidArchModule(module, android.DeviceSupported,
+ android.MultilibBoth, properties...)
}