Export NewPrebuiltObject
Export NewPrebuiltObject so that clang can use it to provide
clang_rt.crt* cc_object modules.
Test: m checkbuild
Change-Id: I659f956815b140ba064b29284c210c24ae882015
diff --git a/cc/object.go b/cc/object.go
index c0e0a9b..9f2db2e 100644
--- a/cc/object.go
+++ b/cc/object.go
@@ -94,8 +94,8 @@
Crt *bool
}
-func newObject() *Module {
- module := newBaseModule(android.HostAndDeviceSupported, android.MultilibBoth)
+func newObject(hod android.HostOrDeviceSupported) *Module {
+ module := newBaseModule(hod, android.MultilibBoth)
module.sanitize = &sanitize{}
module.stl = &stl{}
return module
@@ -105,7 +105,7 @@
// necessary, but sometimes used to generate .s files from .c files to use as
// input to a cc_genrule module.
func ObjectFactory() android.Module {
- module := newObject()
+ module := newObject(android.HostAndDeviceSupported)
module.linker = &objectLinker{
baseLinker: NewBaseLinker(module.sanitize),
}
diff --git a/cc/prebuilt.go b/cc/prebuilt.go
index fd310a2..f7154ec 100644
--- a/cc/prebuilt.go
+++ b/cc/prebuilt.go
@@ -388,8 +388,8 @@
return true
}
-func newPrebuiltObject() *Module {
- module := newObject()
+func NewPrebuiltObject(hod android.HostOrDeviceSupported) *Module {
+ module := newObject(hod)
prebuilt := &prebuiltObjectLinker{
objectLinker: objectLinker{
baseLinker: NewBaseLinker(nil),
@@ -403,7 +403,7 @@
}
func prebuiltObjectFactory() android.Module {
- module := newPrebuiltObject()
+ module := NewPrebuiltObject(android.HostAndDeviceSupported)
return module.Init()
}
diff --git a/cc/snapshot_prebuilt.go b/cc/snapshot_prebuilt.go
index 3a382a1..fb89224 100644
--- a/cc/snapshot_prebuilt.go
+++ b/cc/snapshot_prebuilt.go
@@ -931,7 +931,7 @@
// development/vendor_snapshot/update.py. As a part of vendor snapshot, vendor_snapshot_object
// overrides the vendor variant of the cc object with the same name, if BOARD_VNDK_VERSION is set.
func VendorSnapshotObjectFactory() android.Module {
- module := newObject()
+ module := newObject(android.DeviceSupported)
prebuilt := &snapshotObjectLinker{
objectLinker: objectLinker{
@@ -949,7 +949,7 @@
// development/vendor_snapshot/update.py. As a part of recovery snapshot, recovery_snapshot_object
// overrides the recovery variant of the cc object with the same name, if BOARD_VNDK_VERSION is set.
func RecoverySnapshotObjectFactory() android.Module {
- module := newObject()
+ module := newObject(android.DeviceSupported)
prebuilt := &snapshotObjectLinker{
objectLinker: objectLinker{