diff --git a/BUILD.gn b/BUILD.gn index 708663a1743ac3a431e14fc6b959425b8bc01d21..fbd598af5aa8addfa74d175bbc6f1d57aed99f60 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -95,12 +95,9 @@ ohos_shared_library("glibpcre") { group("glib_packages") { deps = [ - ":ginotify", - ":gio", ":glib", ":gmodule", ":gobject", - ":gxdgmime", ] } @@ -338,373 +335,6 @@ ohos_shared_library("gobject") { ############################################################################# ############################################################################# -config("gio_config") { - visibility = [ ":*" ] - include_dirs = [ - ".", - "gio", - "glib", - "gio/xdgmime", - "gio/inotify", - "gmodule", - "//third_party/zlib", - ] - cflags = [ - "-DG_LOG_DOMAIN=\"GLib-GIO\"", - - #"-DGOBJECT_COMPILATION", - "-Wno-sign-compare", - "-Wno-unused-function", - "-Wno-int-conversion", - "-DGIO_COMPILATION", - "-DGIO_MODULE_DIR=\"\"", - "-DLOCALSTATEDIR=\"var\"", - "-Wno-implicit-function-declaration", - "-Wno-format", - "-Wno-conditional-type-mismatch", - "-Wno-self-assign", - "-Wno-unused-value", - "-Wno-unused-function", - "-Wno-pointer-sign", - "-fvisibility=hidden", - "-DMAJOR_IN_SYSMACROS", - "-DG_ENABLE_DEBUG", - ] -} - -ohos_source_set("gio_source") { - sources = [ - # application_sources - "gio/gaction.c", - "gio/gactiongroup.c", - "gio/gactiongroupexporter.c", - "gio/gactionmap.c", - "gio/gapplication.c", - "gio/gapplicationcommandline.c", - "gio/gapplicationimpl-dbus.c", - "gio/gdbusactiongroup.c", - "gio/gdbusmenumodel.c", - "gio/gmenu.c", - "gio/gmenuexporter.c", - "gio/gmenumodel.c", - "gio/gnotification.c", - "gio/gnotificationbackend.c", - "gio/gpropertyaction.c", - "gio/gremoteactiongroup.c", - "gio/gsimpleaction.c", - "gio/gsimpleactiongroup.c", - - # settings_sources - "gio/gdelayedsettingsbackend.c", - "gio/gkeyfilesettingsbackend.c", - "gio/gmemorysettingsbackend.c", - "gio/gnullsettingsbackend.c", - "gio/gsettings-mapping.c", - "gio/gsettings.c", - "gio/gsettingsbackend.c", - "gio/gsettingsschema.c", - "gio/gvdb/gvdb-reader.c", - - # gdbus_sources - "gio/gdbusaddress.c", - "gio/gdbusauth.c", - "gio/gdbusauthmechanism.c", - "gio/gdbusauthmechanismanon.c", - "gio/gdbusauthmechanismexternal.c", - "gio/gdbusauthmechanismsha1.c", - "gio/gdbusauthobserver.c", - "gio/gdbusconnection.c", - "gio/gdbuserror.c", - "gio/gdbusinterface.c", - "gio/gdbusinterfaceskeleton.c", - "gio/gdbusintrospection.c", - "gio/gdbusmessage.c", - "gio/gdbusmethodinvocation.c", - "gio/gdbusnameowning.c", - "gio/gdbusnamewatching.c", - "gio/gdbusobject.c", - "gio/gdbusobjectmanager.c", - "gio/gdbusobjectmanagerclient.c", - "gio/gdbusobjectmanagerserver.c", - "gio/gdbusobjectproxy.c", - "gio/gdbusobjectskeleton.c", - "gio/gdbusprivate.c", - "gio/gdbusproxy.c", - "gio/gdbusserver.c", - "gio/gdbusutils.c", - "gio/gtestdbus.c", - - # portal_sources - "gio/gdocumentportal.c", - "gio/gmemorymonitorportal.c", - "gio/gnetworkmonitorportal.c", - "gio/gopenuriportal.c", - "gio/gportalnotificationbackend.c", - "gio/gportalsupport.c", - "gio/gproxyresolverportal.c", - "gio/gtrashportal.c", - - # local_sources - "gio/ghttpproxy.c", - "gio/glocalfile.c", - "gio/glocalfileenumerator.c", - "gio/glocalfileinfo.c", - "gio/glocalfileinputstream.c", - "gio/glocalfileiostream.c", - "gio/glocalfilemonitor.c", - "gio/glocalfileoutputstream.c", - "gio/glocalvfs.c", - "gio/gsocks4aproxy.c", - "gio/gsocks4proxy.c", - "gio/gsocks5proxy.c", - "gio/thumbnail-verify.c", - - # unix_sources + HAVE_NETLINK - "gio/gnetworkmonitornetlink.c", - "gio/gnetworkmonitornm.c", - - # unix_sources - "gio/gfdonotificationbackend.c", - "gio/gfiledescriptorbased.c", - "gio/ggtknotificationbackend.c", - "gio/giounix-private.c", - "gio/gunixconnection.c", - "gio/gunixcredentialsmessage.c", - "gio/gunixfdlist.c", - "gio/gunixfdmessage.c", - "gio/gunixinputstream.c", - "gio/gunixmount.c", - "gio/gunixmounts.c", - "gio/gunixoutputstream.c", - "gio/gunixsocketaddress.c", - "gio/gunixvolume.c", - "gio/gunixvolumemonitor.c", - - # appinfo_sources - "gio/gdesktopappinfo.c", - - # contenttype_sources - "gio/gcontenttype.c", - - # gdbus_daemon_sources - "gio/gdbusdaemon.c", - - # gio_sources - "gio/gappinfo.c", - "gio/gasynchelper.c", - "gio/gasyncinitable.c", - "gio/gasyncresult.c", - "gio/gbufferedinputstream.c", - "gio/gbufferedoutputstream.c", - "gio/gbytesicon.c", - "gio/gcancellable.c", - "gio/gcharsetconverter.c", - "gio/gcontextspecificgroup.c", - "gio/gconverter.c", - "gio/gconverterinputstream.c", - "gio/gconverteroutputstream.c", - "gio/gcredentials.c", - "gio/gdatagrambased.c", - "gio/gdatainputstream.c", - "gio/gdataoutputstream.c", - "gio/gdrive.c", - "gio/gdtlsclientconnection.c", - "gio/gdtlsconnection.c", - "gio/gdtlsserverconnection.c", - "gio/gdummyfile.c", - "gio/gdummyproxyresolver.c", - "gio/gdummytlsbackend.c", - "gio/gemblem.c", - "gio/gemblemedicon.c", - "gio/gfile.c", - "gio/gfileattribute.c", - "gio/gfileenumerator.c", - "gio/gfileicon.c", - "gio/gfileinfo.c", - "gio/gfileinputstream.c", - "gio/gfileiostream.c", - "gio/gfilemonitor.c", - "gio/gfilenamecompleter.c", - "gio/gfileoutputstream.c", - "gio/gfilterinputstream.c", - "gio/gfilteroutputstream.c", - "gio/gicon.c", - "gio/ginetaddress.c", - "gio/ginetaddressmask.c", - "gio/ginetsocketaddress.c", - "gio/ginitable.c", - "gio/ginputstream.c", - "gio/gioerror.c", - "gio/giomodule-priv.c", - "gio/giomodule.c", - "gio/gioscheduler.c", - "gio/giostream.c", - "gio/glistmodel.c", - "gio/gliststore.c", - "gio/gloadableicon.c", - "gio/gmarshal-internal.c", - "gio/gmemoryinputstream.c", - "gio/gmemorymonitor.c", - "gio/gmemorymonitordbus.c", - "gio/gmemoryoutputstream.c", - "gio/gmount.c", - "gio/gmountoperation.c", - "gio/gnativesocketaddress.c", - "gio/gnativevolumemonitor.c", - "gio/gnetworkaddress.c", - "gio/gnetworking.c", - "gio/gnetworkmonitor.c", - "gio/gnetworkmonitorbase.c", - "gio/gnetworkservice.c", - "gio/goutputstream.c", - "gio/gpermission.c", - "gio/gpollableinputstream.c", - "gio/gpollableoutputstream.c", - "gio/gpollableutils.c", - "gio/gpollfilemonitor.c", - "gio/gproxy.c", - "gio/gproxyaddress.c", - "gio/gproxyaddressenumerator.c", - "gio/gproxyresolver.c", - "gio/gresolver.c", - "gio/gresource.c", - "gio/gresourcefile.c", - "gio/gseekable.c", - "gio/gsimpleasyncresult.c", - "gio/gsimpleiostream.c", - "gio/gsimplepermission.c", - "gio/gsimpleproxyresolver.c", - "gio/gsocket.c", - "gio/gsocketaddress.c", - "gio/gsocketaddressenumerator.c", - "gio/gsocketclient.c", - "gio/gsocketconnectable.c", - "gio/gsocketconnection.c", - "gio/gsocketcontrolmessage.c", - "gio/gsocketinputstream.c", - "gio/gsocketlistener.c", - "gio/gsocketoutputstream.c", - "gio/gsocketservice.c", - "gio/gsrvtarget.c", - "gio/gsubprocess.c", - "gio/gsubprocesslauncher.c", - "gio/gtask.c", - "gio/gtcpconnection.c", - "gio/gtcpwrapperconnection.c", - "gio/gthemedicon.c", - "gio/gthreadedresolver.c", - "gio/gthreadedresolver.h", - "gio/gthreadedsocketservice.c", - "gio/gtlsbackend.c", - "gio/gtlscertificate.c", - "gio/gtlsclientconnection.c", - "gio/gtlsconnection.c", - "gio/gtlsdatabase.c", - "gio/gtlsfiledatabase.c", - "gio/gtlsinteraction.c", - "gio/gtlspassword.c", - "gio/gtlsserverconnection.c", - "gio/gunionvolumemonitor.c", - "gio/gvfs.c", - "gio/gvolume.c", - "gio/gvolumemonitor.c", - "gio/gzlibcompressor.c", - "gio/gzlibdecompressor.c", - - # out - "gio/gdbus-daemon-generated.c", - "gio/gioenumtypes.c", - "gio/xdp-dbus.c", - ] - - configs = [ ":gio_config" ] -} - -ohos_shared_library("gio") { - deps = [ - ":ginotify", - ":gio_source", - ":glib", - ":gmodule", - ":gobject", - ":gxdgmime", - "//third_party/zlib:libz", - ] - part_name = "glib" - subsystem_name = "thirdparty" -} - -config("gxdgmime_config") { - visibility = [ ":*" ] - include_dirs = [ - ".", - "gmodule", - "glib", - ] - cflags = [ - "-DXDG_PREFIX=_gio_xdg", - "-fvisibility=hidden", - "-Wno-shift-negative-value", - "-Wno-sign-compare", - ] -} - -ohos_source_set("gxdgmime_source") { - sources = [ - "gio/xdgmime/xdgmime.c", - "gio/xdgmime/xdgmimealias.c", - "gio/xdgmime/xdgmimecache.c", - "gio/xdgmime/xdgmimeglob.c", - "gio/xdgmime/xdgmimeicon.c", - "gio/xdgmime/xdgmimeint.c", - "gio/xdgmime/xdgmimemagic.c", - "gio/xdgmime/xdgmimeparent.c", - ] - - configs = [ ":gxdgmime_config" ] -} - -ohos_static_library("gxdgmime") { - deps = [ ":gxdgmime_source" ] - part_name = "glib" - subsystem_name = "thirdparty" -} - -config("ginotify_config") { - visibility = [ ":*" ] - include_dirs = [ - ".", - "gmodule", - "glib", - ] - cflags = [ - "-DXDG_PREFIX=_gio_xdg", - "-fvisibility=hidden", - "-Wno-shift-negative-value", - "-Wno-sign-compare", - "-DGIO_COMPILATION", - ] -} - -ohos_source_set("ginotify_source") { - sources = [ - "gio/inotify/ginotifyfilemonitor.c", - "gio/inotify/inotify-helper.c", - "gio/inotify/inotify-kernel.c", - "gio/inotify/inotify-missing.c", - "gio/inotify/inotify-path.c", - "gio/inotify/inotify-sub.c", - ] - - configs = [ ":ginotify_config" ] -} - -ohos_static_library("ginotify") { - deps = [ ":ginotify_source" ] - part_name = "glib" - subsystem_name = "thirdparty" -} - config("g_mem_dfx_config") { include_dirs = [ "glibmemdfx", diff --git a/config.h b/config.h index 2fb2ad84d7c1a70d0370d88ecfb023337527b07c..0b4fb178b43230b457c7a4a299205406be0e9948 100644 --- a/config.h +++ b/config.h @@ -19,7 +19,12 @@ #define ALIGNOF_UNSIGNED_LONG 4 #endif +#ifndef OHOS_OPT_COMPAT +/* ohos.opt.compat.001: + * Remove dependency to gettext + */ #define ENABLE_NLS 1 +#endif #define EXEEXT diff --git a/glib/ggettext.c b/glib/ggettext.c index 303b9b9b6a831f9d37c5ae4ac101373a0ea71295..4d4cb2503496e1dd939e6830fe63f9d695ad4e0e 100644 --- a/glib/ggettext.c +++ b/glib/ggettext.c @@ -40,7 +40,12 @@ #include #include +#ifndef OHOS_OPT_COMPAT +/* ohos.opt.compat.001: + * Remove dependency to gettext + */ #include +#endif #ifdef G_OS_WIN32 diff --git a/glib/gi18n-lib.h b/glib/gi18n-lib.h index 74e50a3a8c117bd3e38dcf8451577e5f477b4c06..b6cc3d83ea9a14b83666147ea66ca4b4f9e57795 100644 --- a/glib/gi18n-lib.h +++ b/glib/gi18n-lib.h @@ -20,7 +20,12 @@ #include +#ifndef OHOS_OPT_COMPAT +/* ohos.opt.compat.001: + * Remove dependency to gettext + */ #include +#endif #include #ifndef GETTEXT_PACKAGE diff --git a/glib/gi18n.h b/glib/gi18n.h index 5f996d24e8360238c721f1028045dfff5e7f7cd8..a3e11c4a715f096ec88346e50c20c53429f11e78 100644 --- a/glib/gi18n.h +++ b/glib/gi18n.h @@ -20,7 +20,12 @@ #include +#ifndef OHOS_OPT_COMPAT +/* ohos.opt.compat.001: + * Remove dependency to gettext + */ #include +#endif #include #define _(String) gettext (String)