From 705c84b9eeca8eec96fd69ecf0a73c0a4cd6c12a Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 8 Aug 2016 10:45:03 -0700 Subject: [PATCH] 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 --- cc/androidmk.go | 1 + cc/ndk_library.go | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cc/androidmk.go b/cc/androidmk.go index 4986387ef..c19aa17b1 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -201,6 +201,7 @@ func (installer *baseInstaller) AndroidMk(ctx AndroidMkContext, ret *android.And func (c *stubDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) { ret.SubName = "." + strconv.Itoa(c.properties.ApiLevel) + ret.Class = "SHARED_LIBRARIES" ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error { path, file := filepath.Split(c.installPath) diff --git a/cc/ndk_library.go b/cc/ndk_library.go index 85c20920e..fe52b0e62 100644 --- a/cc/ndk_library.go +++ b/cc/ndk_library.go @@ -265,7 +265,7 @@ func (stub *stubDecorator) install(ctx ModuleContext, path android.Path) { 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 @@ func newStubLibrary() *Module { 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...) }