summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_exe.gypi
Commit message (Collapse)AuthorAgeFilesLines
* startup: rename chrome_dll_main to chrome_mainevan@chromium.org2010-11-181-2/+2
| | | | | | | | | | | | | | | Startup works like this: 1) platform-specific main, which calls 2) ChromeMain(), which calls 3) subprocess-specific main, like RendererMain() On Windows the middle step is kept in a DLL, but it's a framework on Mac and it's part of the original binary on Linux. This no-op change renames the file to match the function it does. Review URL: http://codereview.chromium.org/5183003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66660 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: fix build of setuid sandbox.viettrungluu@chromium.org2010-11-161-5/+0
| | | | | | | | | | | This was broken by http://src.chromium.org/viewvc/chrome?view=rev&revision=65892 . BUG=none TEST=none Review URL: http://codereview.chromium.org/4980003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66211 0039d316-1c4b-4281-b951-d872f2087c98
* Fix location for osmesa.so on Mac.nirnimesh@chromium.org2010-11-091-1/+1
| | | | | | | | | | | BUG= TEST= Review URL: http://codereview.chromium.org/4731001 Review URL: http://codereview.chromium.org/4719003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65594 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor: move all the policy-template related targets into one gypi filegfeher@chromium.org2010-11-091-70/+0
| | | | | | | | | BUG=none TEST=build completes on all platforms Review URL: http://codereview.chromium.org/4644002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65510 0039d316-1c4b-4281-b951-d872f2087c98
* chrome_exe_main: name os-specific files according to naming patternevan@chromium.org2010-11-041-3/+2
| | | | | | | | | | | | These files probably just predate us having a _win suffix on Windows-specific code. BUG=18504 TEST=compiles Review URL: http://codereview.chromium.org/4451001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65001 0039d316-1c4b-4281-b951-d872f2087c98
* ui_tests run with --use-gl=osmesa so they use the OSMesa software renderer ↵apatrick@chromium.org2010-10-271-21/+16
| | | | | | | | | | | | | for GL. This to ensure that ui_tests run consistently regardless of the GPU capabilities, or absense, of the box they run on. TEST=try BUG=none Review URL: http://codereview.chromium.org/4138003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64122 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the mesa gl issue in chrome.zmo@google.com2010-10-201-0/+21
| | | | | | | | BUG=58343 TEST=none Review URL: http://codereview.chromium.org/3860004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63236 0039d316-1c4b-4281-b951-d872f2087c98
* Disable incremental linking on chrome.exescottbyer@chromium.org2010-10-121-0/+13
| | | | | | | | | | | | | | | | chrome.dll and chrome.exe both had incremental linking turned on, which means they were both trying to use chrome.ilk for the incremental linking storage, causing incremental linking to always fail for both. Chrome.exe is small and doesn't benefit much from incremental linking, so turn it off there and let chrome.dll have the playground. BUG=21266 TEST=gyp the projects, load them up, and check incremental linking for the chrome project with a debug target, should be off. Check the chrome_dll target, should be on. Review URL: http://codereview.chromium.org/3673001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62344 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: include an updated copy of xdg-mime that fixes default browser ↵mdm@chromium.org2010-09-031-0/+1
| | | | | | | | | | | selection on KDE 4. This should probably wait until after we branch for M7 this week. BUG=18106,33842 TEST=default browser selection works in KDE 4 on distributions shipping CVS xdg-mime Review URL: http://codereview.chromium.org/3258009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58449 0039d316-1c4b-4281-b951-d872f2087c98
* Reland r57812 (Add the new Mac manifest to the application bundle) and ↵gfeher@chromium.org2010-09-021-25/+74
| | | | | | | | | | | | | | | remove dummy translations Add the policy templates generated from chrome/app/policy_templates.json to the Mac application bundle. (The template generator for Mac is implemented in CL 3116027) Also remove the old manifest file and references to translations that are not there yet. The problem with the previous landing attempt was that in Release mode build, the following script was looking for binary files that were not there: build/mac/strip_from_xcode BUG=49316 TEST=add Chromium to the managed applications' list in the OSX Workgroup Manager, and see if it shows the manageable preferences with English descriptions Review URL: http://codereview.chromium.org/3287003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58366 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 57812 - Add the new Mac manifest to the application bundlegfeher@chromium.org2010-08-291-66/+25
| | | | | | | | | | | | Add the policy templates generated from chrome/app/policy_templates.json to the Mac application bundle. (The template generator for Mac is implemented in CL 3116027) BUG=49316 TEST=add Chromium to the managed applications' list in the OSX Workgroup Manager, and see if it shows the manageable preferences TBR=thomasvl@chromium.org Review URL: http://codereview.chromium.org/3267003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57813 0039d316-1c4b-4281-b951-d872f2087c98
* Add the new Mac manifest to the application bundlegfeher@chromium.org2010-08-291-25/+66
| | | | | | | | | | | Add the policy templates generated from chrome/app/policy_templates.json to the Mac application bundle. (The template generator for Mac is implemented in CL 3116027) BUG=49316 TEST=add Chromium to the managed applications' list in the OSX Workgroup Manager, and see if it shows the manageable preferences Review URL: http://codereview.chromium.org/3143036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57812 0039d316-1c4b-4281-b951-d872f2087c98
* Eliminate the chrome_version_info target completely.evan@chromium.org2010-08-261-3/+0
| | | | | | | | | | It did two things: 1) built two source files -- this is moved into the "common" target 2) on Linux, generated some data used by those source files -- this is moved into an action on the "common" target Review URL: http://codereview.chromium.org/3152052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57588 0039d316-1c4b-4281-b951-d872f2087c98
* Move chrome_version_info target into chrome_common.evan@chromium.org2010-08-231-62/+0
| | | | | | | | | | | | | | The source files live in chrome/common, and they're there because we need to get at version infomation all over the product (not just from the exe, like the gyp files are currently written). This refactoring is necessary for a follow-up change. TEST=compiles Review URL: http://codereview.chromium.org/3113026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57084 0039d316-1c4b-4281-b951-d872f2087c98
* Added a method to check if a browser is closing.pinkerton@chromium.org2010-08-101-1/+3
| | | | | | | | | | | | | | | | Added a method to get the next node ID for bookmarks managed by the bookmark model. Added AppleScript support. Added scripting definition file. Added support for saving tab. Added localization support. Added consistent error nos/error messages. (patch developed by v.a.shreyas@gmail.com) BUG=27468 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55569 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: Break another common->app dependency.thestig@chromium.org2010-07-201-4/+4
| | | | | | | | BUG=46666 TEST=none Review URL: http://codereview.chromium.org/3007008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53113 0039d316-1c4b-4281-b951-d872f2087c98
* Stuff the MCX policy file into the app bundle where it belongs.avi@chromium.org2010-07-161-1/+26
| | | | | | | | | BUG=http://crbug.com/45334 TEST=build chromium, open the package, look in the resources folder, see either "org.chromium.Chromium.manifest" or "com.google.Chrome.manifest" (depending on the build). Open the file, see either "Chromium" or "Google Chrome" at the top (again, depending on the build). Review URL: http://codereview.chromium.org/2809057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52710 0039d316-1c4b-4281-b951-d872f2087c98
* linux: build fixevan@chromium.org2010-06-231-1/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50653 0039d316-1c4b-4281-b951-d872f2087c98
* Update installer for internal plugin.jam@chromium.org2010-06-151-5/+6
| | | | | | Review URL: http://codereview.chromium.org/2799006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49757 0039d316-1c4b-4281-b951-d872f2087c98
* On Mac, move internal plugins to live inside the framework ...viettrungluu@chromium.org2010-06-141-11/+4
| | | | | | | | | | | ... in particular in a subdirectory called "Internet Plug-Ins". BUG=none TEST=builds okay everywhere (including branded builds); internal Flash still okay everywhere on branded builds; on Mac, Flash files end up in above-indicated directory Review URL: http://codereview.chromium.org/2805005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49742 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 49738 [problems running tests] - On Mac, move internal plugins to ↵viettrungluu@chromium.org2010-06-141-4/+11
| | | | | | | | | | | | | | | | live inside the framework ... ... in particular in a subdirectory called "Internet Plug-Ins". BUG=46400 TEST=builds okay everywhere (including branded builds); internal Flash still okay everywhere on branded builds; on Mac, Flash files end up in above-indicated directory Review URL: http://codereview.chromium.org/2823003 TBR=viettrungluu@chromium.org Review URL: http://codereview.chromium.org/2857001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49740 0039d316-1c4b-4281-b951-d872f2087c98
* On Mac, move internal plugins to live inside the framework ...viettrungluu@chromium.org2010-06-141-11/+4
| | | | | | | | | | | ... in particular in a subdirectory called "Internet Plug-Ins". BUG=46400 TEST=builds okay everywhere (including branded builds); internal Flash still okay everywhere on branded builds; on Mac, Flash files end up in above-indicated directory Review URL: http://codereview.chromium.org/2823003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49738 0039d316-1c4b-4281-b951-d872f2087c98
* Second try of building a version of base with -fPIC for internal plugin. ↵jam@chromium.org2010-06-111-0/+5
| | | | | | | | Credit to bradnelson. Review URL: http://codereview.chromium.org/2767010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49597 0039d316-1c4b-4281-b951-d872f2087c98
* Move the resources used by net-internals into a pak file.tony@chromium.org2010-06-111-0/+3
| | | | | | | | | | We don't use this yet, but the plan is to move everything in the resources directory into here. BUG=42770 Review URL: http://codereview.chromium.org/2667001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49507 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 49502 - Build a version of base with -fPIC turned on. Use it for ↵jam@chromium.org2010-06-111-5/+0
| | | | | | | | | | | internal plugin. Credit to bradnelson who did this. Review URL: http://codereview.chromium.org/2796002 TBR=jam@chromium.org Review URL: http://codereview.chromium.org/2778007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49505 0039d316-1c4b-4281-b951-d872f2087c98
* Build a version of base with -fPIC turned on. Use it for internal plugin. ↵jam@chromium.org2010-06-111-0/+5
| | | | | | | | Credit to bradnelson who did this. Review URL: http://codereview.chromium.org/2796002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49502 0039d316-1c4b-4281-b951-d872f2087c98
* Take Keystone keys out of the framework's Info.plist. They now live only inmark@chromium.org2010-06-091-3/+5
| | | | | | | | | | | | | | | | the outer application's Info.plist. This ensures that the framework and other contents of the versioned directory can be bit-for-bit identical for a given version, regardless of configured Keystone channel. This will enable binary diff updates, because they will not need knowledge of the channel a user is upgrading from. BUG=45017 TEST=Keystone still functions properly, channel still shows up in the about window and about:version of official builds Review URL: http://codereview.chromium.org/2791001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49334 0039d316-1c4b-4281-b951-d872f2087c98
* Include plugin.vch files for Flash Player (on official builds).viettrungluu@chromium.org2010-06-041-1/+2
| | | | | | | | | BUG=none TEST=everything still builds, new-style DRM-protected content plays Review URL: http://codereview.chromium.org/2630001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48978 0039d316-1c4b-4281-b951-d872f2087c98
* [Mac] packaging process cleanup: Net of this is the zip off the official ↵thomasvl@chromium.org2010-06-021-53/+0
| | | | | | | | | | | | | | builder will have everything for packaging so the final signing/dmg creation is self contained instead of having to live in both places. - Move all the installer related bits into the installer folder - Add the collection of these bits into a specific target - Collect the internal bits also during the installer target BUG=42635 TEST=none Review URL: http://codereview.chromium.org/2417007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48732 0039d316-1c4b-4281-b951-d872f2087c98
* Break gyp cycles on Linux.tony@chromium.org2010-05-241-5/+5
| | | | | | | | | | The cycle is between installer.gyp and chrome.gyp. The fix is to switch installer.gyp into installer.gypi and include it into chrome.gyp BUG=35308 Review URL: http://codereview.chromium.org/2067018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48007 0039d316-1c4b-4281-b951-d872f2087c98
* gyp: unify toolkit_views usageevan@chromium.org2010-04-271-5/+0
| | | | | | | | | | | Now that we can rely on toolkit_views to be set when appropriate, we can simplify a bunch of logic in gyp. TEST=compiles Review URL: http://codereview.chromium.org/1741010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45727 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor FileVersionInfo into an interface with platform implementations.tony@chromium.org2010-04-141-0/+63
| | | | | | | | | | | | | This allows us to move the chrome specific version informaton used by Linux into src/chrome. Add a GetChromeVersionInfo() for Linux in src/chrome/app/ and make sure to use this in src/chrome. In src/webkit/glue, add a new glue method for getting the product version. When compiling chrome, use an implementation in src/chrome/renderer (which uses GetChromeVersionInfo()) and a stub implementation for test_shell. Review URL: http://codereview.chromium.org/1560027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44435 0039d316-1c4b-4281-b951-d872f2087c98
* .gyp(i) changes to put "Cobwerks" into the right place(s) on Linux and Mac.viettrungluu@chromium.org2010-03-261-1/+12
| | | | | | | | | BUG=none TEST=everything should still build Review URL: http://codereview.chromium.org/1409003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42819 0039d316-1c4b-4281-b951-d872f2087c98
* Don't strip main from the browser or helper app executables. This helpsmark@chromium.org2010-03-261-0/+1
| | | | | | | | | | | backtraces of stripped executables look more reasonable. BUG=39232 TEST=gdb backtrace in a stripped executable with no symbols loaded should show thread 0 beginning in main Review URL: http://codereview.chromium.org/1460001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42817 0039d316-1c4b-4281-b951-d872f2087c98
* Try rel-land the cobwerks gyp changecpu@chromium.org2010-03-261-0/+1
| | | | | | | | | | | | | See issue http://codereview.chromium.org/1338007 BUG=36229 TEST=none TBR=bradnelson Review URL: http://codereview.chromium.org/1420002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42789 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 42719 - Adding the cobwerks plugin piecemealcpu@chromium.org2010-03-261-1/+0
| | | | | | | | | | | | | | | BUG=36229 TEST=none TBR=nsylvain Review URL: http://codereview.chromium.org/1338007 TBR=cpu@chromium.org Review URL: http://codereview.chromium.org/1360003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42721 0039d316-1c4b-4281-b951-d872f2087c98
* Adding the cobwerks plugin piecemealcpu@chromium.org2010-03-261-0/+1
| | | | | | | | | | | | BUG=36229 TEST=none TBR=bradnelson Review URL: http://codereview.chromium.org/1338007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42719 0039d316-1c4b-4281-b951-d872f2087c98
* Integrate Chrome sandbox changes with NaCl (add Win64 support)gregoryd@google.com2010-03-241-3/+2
| | | | | | | | | Two significant changes: - Explicitly allow processes to act as servers for named pipes for pipes with chrome.nacl prefix. This worked implicitly on Win32 but doesn't on Win64. - NaCl broker process does not run in the sandbox (by design) Review URL: http://codereview.chromium.org/1098009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42552 0039d316-1c4b-4281-b951-d872f2087c98
* Don't link NaCl code into chrome.exe on Mac (fix bug 37707)gregoryd@google.com2010-03-121-2/+0
| | | | | | | | | BUG=37707 TEST=build Chrome on Mac Review URL: http://codereview.chromium.org/853007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41449 0039d316-1c4b-4281-b951-d872f2087c98
* Allow the use of the master_preferences file in Linux.tony@chromium.org2010-03-101-0/+2
| | | | | | | | | | | | | | | Also refactor FirstRunTabs to use GURL instead of wstring. BUG=none TEST=Add master_preferences file to directory containing the chrome binary and execute chrome with the --first-run option. Original patch by bgmerrell@gmail.com at http://codereview.chromium.org/551160 Review URL: http://codereview.chromium.org/796001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41131 0039d316-1c4b-4281-b951-d872f2087c98
* Remove nacl win64 binary from chrome dependencies, add it to installer ↵gregoryd@google.com2010-03-081-1/+0
| | | | | | | | | | | dependencies. This will allow developers who don't have the 64-bit tools installed to build Chrome successfully (without the support for NaCl on Win64), while making sure all the binaries are in place when building the installer. To build Chrome with NaCl support for Win64 developers will have to build both 'chrome' and 'chrome_nacl_win64' targets. Review URL: http://codereview.chromium.org/671017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40957 0039d316-1c4b-4281-b951-d872f2087c98
* Revert previous incorrect change that tries to fix the nacl64 build failure.brettw@chromium.org2010-03-061-1/+0
| | | | | | | | | | | | | Supply a dummy implementation of url_util::AddStandardScheme that will allow us to link a 64-bit library on an otherwise 32-bit OS. We don't otherwise need googleurl (or else it wouldn't link for other reasons) so we're guaranteed not calling AddStandardScheme is OK. BUG=none TEST=none Review URL: http://codereview.chromium.org/668222 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40822 0039d316-1c4b-4281-b951-d872f2087c98
* Add googleurl dependency to one of the nacl64 targets, remove previous try tobrettw@chromium.org2010-03-061-0/+1
| | | | | | | | | | fix this change. TEST=none BUG=none Review URL: http://codereview.chromium.org/668221 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40821 0039d316-1c4b-4281-b951-d872f2087c98
* Add NaCl Win64 binaries to chrome dependenciesgregoryd@google.com2010-03-051-0/+1
| | | | | | Review URL: http://codereview.chromium.org/669204 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40793 0039d316-1c4b-4281-b951-d872f2087c98
* Rename the DLL and the executable used by NaCl on Win64 ↵gregoryd@google.com2010-02-251-3/+3
| | | | | | | | | | | (chrome_nacl_win64.dll -> nacl64.dll, nacl.exe -> nacl64.exe). The motivation for the change: 1. Make the name shorter (look better when installed on users machines) 2. Allow differentiation between 64-bit and 32-bit binaries if we decide to switch to a similar design for 32-bits too. Review URL: http://codereview.chromium.org/650195 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40043 0039d316-1c4b-4281-b951-d872f2087c98
* missed GYP changes for *BSDpvalchev@google.com2010-02-221-1/+1
| | | | | | Review URL: http://codereview.chromium.org/572020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39628 0039d316-1c4b-4281-b951-d872f2087c98
* Adding a secondary mini_installer target for Chrome Frame. This will remove ↵robertshield@chromium.org2010-01-191-16/+1
| | | | | | | | | | | | | | the need to have different build scripts to build either Chrome or Chrome Frame. Also remove the now-unneeded gyp variables 'chrome_frame_define' and 'google_update_appid'. BUG=Both Chrome and Chrome Frame products should be buildable from a single solution file - we shouldn't need to run GYP with different settings to get a CF solution. TEST=none Review URL: http://codereview.chromium.org/542078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36546 0039d316-1c4b-4281-b951-d872f2087c98
* Some Chrome Frame cleanup:robertshield@chromium.org2010-01-051-2/+2
| | | | | | | | | | | | | | | | | | 1) Rearrange the chrome_frame.gyp file to: a) Split out most of CF into a static lib to make writing unit tests easier (not having to re-include source files). b) Remove most of the un-needed xulrunner-sdk includes. 2) Move all OBJECT_ENTRY_AUTO macros to chrome_tab.cc since they don't work without extra work when residing in a lib. 3) Rename npchrome_tab.dll to npchrome_frame.dll. BUG=none TEST=none Review URL: http://codereview.chromium.org/523040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35543 0039d316-1c4b-4281-b951-d872f2087c98
* Split more targets from chrome.gyp to add support for building Native Client ↵gregoryd@google.com2009-12-281-0/+545
| | | | | | | | | | | | | | | | for 64-bit Windows. This CL is required for supporting Native Client on 64-bit Windows. On Win64 we will use a 64-bit executable to load NaCl modules. Since we have only one version of Chrome on Windows, this executable has to be built together with 32-bit Chrome binaries. For the targets that are required for both 32-bit and 64-bit builds, this CL moves the shared parts of the target definitions into target-specific gypi files (such as base.gypi). New 64-bit only targets are added. Since we would like to port as few code as possible at this point, some 64-bit targets include less source files or less dependencies than the original 32-bit targets. These targets will have nacl_win64 in their name - to emphasize that they should be used for NaCl only. Some 64-bit targets are identical to the 32-bit targets in everything except for the target platform - these will have only win64 in their name. TEST=none BUG=28176 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=35237 Review URL: http://codereview.chromium.org/384068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35305 0039d316-1c4b-4281-b951-d872f2087c98
* revert r35237 since it causes Mac unit tests to fail.jeremy@chromium.org2009-12-241-545/+0
| | | | | | | | | | "Split more targets from chrome.gyp to add support for building Native Client for 64-bit Windows. " BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/520006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35259 0039d316-1c4b-4281-b951-d872f2087c98