Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5aa1fcb authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

Merge changes I34385c48,I1e48947c into main am: 45ac47ed am: 4e2594e2 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2983535



Change-Id: Ia90c0116660103fbda31cad4ef91ef116bb1deb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5cb6758f 4e2594e2

cc/prebuilt.go

+3 −0
Original line number Diff line number Diff line
@@ -260,6 +260,9 @@ func (p *prebuiltLibraryLinker) nativeCoverage() bool { 


func (p *prebuiltLibraryLinker) disablePrebuilt() {

	p.properties.Srcs = nil

	p.properties.Sanitized.None.Srcs = nil

	p.properties.Sanitized.Address.Srcs = nil

	p.properties.Sanitized.Hwaddress.Srcs = nil

}



// Implements versionedInterface

cc/stl.go

+7 −5
Original line number Diff line number Diff line
@@ -205,12 +205,14 @@ func (stl *stl) flags(ctx ModuleContext, flags Flags) Flags { 
			flags.extraLibFlags = append(flags.extraLibFlags, "-nostdlib++")

			if ctx.Windows() {

				flags.Local.CppFlags = append(flags.Local.CppFlags,

					// Disable visiblity annotations since we're using static

					// libc++.

					"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",

					"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",

					// These macros can also be defined by libc++'s __config

					// or __config_site headers so define them the same way

					// (i.e. to nothing). Disable visibility annotations since

					// we're using static libc++.

					"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS=",

					"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS=",

					// Use Win32 threads in libc++.

					"-D_LIBCPP_HAS_THREAD_API_WIN32")

					"-D_LIBCPP_HAS_THREAD_API_WIN32=")

			}

		}

	case "libstdc++":