Add necessary temporary hacks to make Glean compile inside MozillaAppServices

This commit is contained in:
Jan-Erik Rediger 2020-09-07 13:17:51 +02:00
Родитель 6365815711
Коммит 01edd81165
2 изменённых файлов: 22 добавлений и 6 удалений

Просмотреть файл

@ -4,9 +4,17 @@
import Foundation
extension String {
public init(freeingRustString rustString: UnsafeMutablePointer<CChar>) {
defer { sync15_passwords_destroy_string(rustString) }
self.init(cString: rustString)
}
}
/*
* NOTE: This is now provided by Glean.
* Because it's all compiled into a single libmegazord.a it doesn't matter which `destroy_string` we call,
* internally it defers to the same string implementation.
* Because Glean is added as a submodule it's easier to change this occurence than it it to change the one of Glean.
*/
/*
extension String {
public init(freeingRustString rustString: UnsafeMutablePointer<CChar>) {
defer { sync15_passwords_destroy_string(rustString) }
self.init(cString: rustString)
}
}
*/

Просмотреть файл

@ -7,6 +7,14 @@
FOUNDATION_EXPORT double MegazordClientVersionNumber;
FOUNDATION_EXPORT const unsigned char MegazordClientVersionString[];
/**
* FIXME: Glean has a `getGleanVersion` function that uses this constant.
* That function is not actually used (and the version wrong anyway).
* Because Glean is added as a submodule it's easier to change this occurence than it it to change the one of Glean,
* for now.
*/
static double GleanVersionNumber = 0.0;
#import "RustFxAFFI.h"
#import "RustPasswordAPI.h"
#import "RustLogFFI.h"