Merge "Move xxd(1) to toybox."
diff --git a/android/variable.go b/android/variable.go
index 4534774..f496008 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -54,10 +54,6 @@
Cflags []string
}
- Device_uses_hwc2 struct {
- Cflags []string
- }
-
Override_rs_driver struct {
Cflags []string
}
@@ -190,7 +186,6 @@
UseGoma *bool `json:",omitempty"`
Debuggable *bool `json:",omitempty"`
Eng *bool `json:",omitempty"`
- Device_uses_hwc2 *bool `json:",omitempty"`
Treble_linker_namespaces *bool `json:",omitempty"`
Enforce_vintf_manifest *bool `json:",omitempty"`
Pdk *bool `json:",omitempty"`
diff --git a/cc/config/clang.go b/cc/config/clang.go
index 0f22034..89e567d 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -185,9 +185,6 @@
"-Wno-c++98-compat-extra-semi",
// Disable this warning until we can fix all instances where it fails.
- "-Wno-self-assign-overloaded",
-
- // Disable this warning until we can fix all instances where it fails.
"-Wno-constant-logical-operand",
// Disable this warning because we don't care about behavior with older compilers.
diff --git a/cc/config/x86_windows_host.go b/cc/config/x86_windows_host.go
index 6300a1b..e23c0a0 100644
--- a/cc/config/x86_windows_host.go
+++ b/cc/config/x86_windows_host.go
@@ -140,6 +140,9 @@
pctx.StaticVariable("WindowsX8664ClangCppflags", strings.Join(windowsX8664ClangCppflags, " "))
pctx.StaticVariable("WindowsIncludeFlags", strings.Join(windowsIncludeFlags, " "))
+ // Yasm flags
+ pctx.StaticVariable("WindowsX86YasmFlags", "-f win32 -m x86")
+ pctx.StaticVariable("WindowsX8664YasmFlags", "-f win64 -m amd64")
}
type toolchainWindows struct {
@@ -228,6 +231,14 @@
return "${config.WindowsClangLldflags} ${config.WindowsX8664ClangLldflags}"
}
+func (t *toolchainWindowsX86) YasmFlags() string {
+ return "${config.WindowsX86YasmFlags}"
+}
+
+func (t *toolchainWindowsX8664) YasmFlags() string {
+ return "${config.WindowsX8664YasmFlags}"
+}
+
func (t *toolchainWindows) ShlibSuffix() string {
return ".dll"
}