Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Use Fuchsia's Windows Clang SDK #29736

Merged
bdero merged 4 commits into from
Nov 14, 2021
Merged

Use Fuchsia's Windows Clang SDK #29736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d151a8
Use Fuchsia's Windows Clang SDK
bdero Nov 14, 2021
8874f95
Make alias structs named due to use of default values + C++'s require…
bdero Nov 14, 2021
bfd8ee7
Update path in tools/dia_dll.py
bdero Nov 14, 2021
8c40304
Bump buildroot
bdero Nov 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'bfa04ad85fed176aa909f880ef5c8009c945ba03',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '3dc3ec56b3dc76ba60c8348053a9f6ef3446b0f2',

# Fuchsia compatibility
#
Expand Down Expand Up @@ -632,12 +632,11 @@ deps = {
'dep_type': 'cipd',
},

# TODO(fxb/4443): Remove this when Fuchsia can provide the Windows Clang Toolchain
'src/third_party/llvm-build/Release+Asserts': {
'src/buildtools/windows-x64/clang': {
'packages': [
{
'package': 'flutter/clang/win-amd64',
'version': 'git_revision:5ec206df8534d2dd8cb9217c3180e5ddba587393'
'package': 'fuchsia/third_party/clang/windows-amd64',
'version': 'a4WSJSNW8w7fYZ5GoOcCM7PlBxrXknK4ni71zZV1R_gC'
}
],
'condition': 'download_windows_deps',
Expand Down
18 changes: 9 additions & 9 deletions shell/platform/windows/testing/wm_builders.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,30 +26,30 @@ struct Win32Message {
HWND hWnd;
};

typedef enum {
typedef enum WmFieldExtended {
kNotExtended = 0,
kExtended = 1,
} WmFieldExtended;

typedef enum {
typedef enum WmFieldContext {
kNoContext = 0,
kAltHeld = 1,
} WmFieldContext;

typedef enum {
typedef enum WmFieldPrevState {
kWasUp = 0,
kWasDown = 1,
} WmFieldPrevState;

typedef enum {
typedef enum WmFieldTransitionState {
kBeingReleased = 0,
kBeingPressed = 1,
} WmFieldTransitionState;

// WM_KEYDOWN messages.
//
// See https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-keydown.
typedef struct {
typedef struct WmKeyDownInfo {
uint32_t key;

uint8_t scan_code;
Expand All @@ -74,7 +74,7 @@ typedef struct {
// WM_KEYUP messages.
//
// See https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-keyup.
typedef struct {
typedef struct WmKeyUpInfo {
uint32_t key;

uint8_t scan_code;
Expand All @@ -96,7 +96,7 @@ typedef struct {
// WM_CHAR messages.
//
// See https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-char.
typedef struct {
typedef struct WmCharInfo {
uint32_t char_code;

uint8_t scan_code;
Expand All @@ -118,7 +118,7 @@ typedef struct {
// WM_SYSKEYUP messages.
//
// See https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-syskeyup.
typedef struct {
typedef struct WmSysKeyUpInfo {
uint32_t key;

uint8_t scan_code;
Expand All @@ -140,7 +140,7 @@ typedef struct {
// WM_DEADCHAR messages.
//
// See https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-deadchar.
typedef struct {
typedef struct WmDeadCharInfo {
uint32_t char_code;

uint8_t scan_code;
Expand Down
4 changes: 2 additions & 2 deletions tools/dia_dll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

# Path constants. (All of these should be absolute paths.)
THIS_DIR = os.path.abspath(os.path.dirname(__file__))
LLVM_BUILD_DIR = os.path.abspath(os.path.join(THIS_DIR, '..', '..', 'third_party',
'llvm-build', 'Release+Asserts'))
LLVM_BUILD_DIR = os.path.abspath(os.path.join(THIS_DIR, '..', '..', 'buildtools',
'windows-x64', 'clang'))


def GetDiaDll():
Expand Down