diff options
| -rw-r--r-- | cc/config/x86_linux_bionic_host.go | 2 | ||||
| -rw-r--r-- | cc/config/x86_linux_host.go | 2 | ||||
| -rw-r--r-- | cc/sanitize.go | 2 | ||||
| -rw-r--r-- | fsgen/fsgen_mutators.go | 4 |
4 files changed, 7 insertions, 3 deletions
diff --git a/cc/config/x86_linux_bionic_host.go b/cc/config/x86_linux_bionic_host.go index ddc86c299..d2f88ef34 100644 --- a/cc/config/x86_linux_bionic_host.go +++ b/cc/config/x86_linux_bionic_host.go @@ -28,7 +28,7 @@ var ( "-fno-omit-frame-pointer", "-U_FORTIFY_SOURCE", - "-D_FORTIFY_SOURCE=2", + "-D_FORTIFY_SOURCE=3", "-fstack-protector-strong", // From x86_64_device diff --git a/cc/config/x86_linux_host.go b/cc/config/x86_linux_host.go index c070050b7..c3f25aa21 100644 --- a/cc/config/x86_linux_host.go +++ b/cc/config/x86_linux_host.go @@ -29,7 +29,7 @@ var ( "-fno-omit-frame-pointer", "-U_FORTIFY_SOURCE", - "-D_FORTIFY_SOURCE=2", + "-D_FORTIFY_SOURCE=3", "-fstack-protector", "--gcc-toolchain=${LinuxGccRoot}", diff --git a/cc/sanitize.go b/cc/sanitize.go index db99a5327..b704ef4bf 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -79,7 +79,7 @@ var ( minimalRuntimeFlags = []string{"-fsanitize-minimal-runtime", "-fno-sanitize-trap=integer,undefined", "-fno-sanitize-recover=integer,undefined"} - memtagStackCommonFlags = []string{"-march=armv8-a+memtag"} + memtagStackCommonFlags = []string{"-Xclang -target-feature -Xclang +mte"} memtagStackLlvmFlags = []string{"-dom-tree-reachability-max-bbs-to-explore=128"} hostOnlySanitizeFlags = []string{"-fno-sanitize-recover=all"} diff --git a/fsgen/fsgen_mutators.go b/fsgen/fsgen_mutators.go index d34ae77a6..4f3d2a750 100644 --- a/fsgen/fsgen_mutators.go +++ b/fsgen/fsgen_mutators.go @@ -187,6 +187,10 @@ func createFsGenState(ctx android.LoadHookContext, generatedPrebuiltEtcModuleNam (*fsGenState.fsDeps["product"])["system_other_avbpubkey"] = defaultDepCandidateProps(ctx.Config()) } + if len(ctx.Config().DeviceManifestFiles()) > 0 { + (*fsGenState.fsDeps["vendor"])["vendor_manifest.xml"] = defaultDepCandidateProps(ctx.Config()) + } + // Add common resources `prebuilt_res` module as dep of recovery partition (*fsGenState.fsDeps["recovery"])[fmt.Sprintf("recovery-resources-common-%s", getDpi(ctx))] = defaultDepCandidateProps(ctx.Config()) (*fsGenState.fsDeps["recovery"])[getRecoveryFontModuleName(ctx)] = defaultDepCandidateProps(ctx.Config()) |