StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert^2 "Add sdk mutator for native modules"

Browse Source 
f8e80229fe

Change-Id: Ic30ab6b844684bfc3e8ece5a1913980d5fbf8de2
This commit is contained in:
Colin Cross
2020-04-07 16:50:32 +00:00
parent f8e80229fe
commit c511bc50dc
21 changed files with 401 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cc/ndk_prebuilt.go
View File

@@ -76,6 +76,8 @@ func NdkPrebuiltObjectFactory() android.Module {
baseLinker: NewBaseLinker(nil),
},
}
module.Properties.AlwaysSdk = true
module.Properties.Sdk_version = StringPtr("current")
module.Properties.HideFromMake = true
return module.Init()
}
@@ -115,10 +117,9 @@ func NdkPrebuiltSharedStlFactory() android.Module {
libraryDecorator: library,
}
module.installer = nil
minVersionString := "minimum"
noStlString := "none"
module.Properties.Sdk_version = &minVersionString
module.stl.Properties.Stl = &noStlString
module.Properties.Sdk_version = StringPtr("minimum")
module.Properties.AlwaysSdk = true
module.stl.Properties.Stl = StringPtr("none")
return module.Init()
}
@@ -135,6 +136,9 @@ func NdkPrebuiltStaticStlFactory() android.Module {
}
module.installer = nil
module.Properties.HideFromMake = true
module.Properties.AlwaysSdk = true
module.Properties.Sdk_version = StringPtr("current")
module.stl.Properties.Stl = StringPtr("none")
module.ModuleBase.EnableNativeBridgeSupportByDefault()
return module.Init()
}