Merge "Build libui and libgui with -std=c++1z" (ad266680) · Commits · e / os / android_frameworks_native-old

libs/gui/Android.bp

+4 −3

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ cc_library_shared {
		"-Werror",
		],
		cppflags: [
		"-std=c++1z",
		"-Weverything",

		// The static constructors and destructors in this library have not been noted to
		@@ -116,7 +117,7 @@ cc_library_shared {
		"SyncFeatures.cpp",
		"view/Surface.cpp",
		"bufferqueue/1.0/B2HProducerListener.cpp",
		"bufferqueue/1.0/H2BGraphicBufferProducer.cpp"
		"bufferqueue/1.0/H2BGraphicBufferProducer.cpp",
		],

		shared_libs: [

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ cc_library_shared {
		"-Werror",
		],
		cppflags: [
		"-std=c++1z",
		"-Weverything",

		// The static constructors and destructors in this library have not been noted to

+0 −12

Original line number	Diff line number	Diff line
		@@ -33,18 +33,6 @@ namespace android {

		const auto FenceTime::NO_FENCE = std::make_shared<FenceTime>(Fence::NO_FENCE);

		void* FenceTime::operator new(size_t byteCount) noexcept {
		void *p = nullptr;
		if (posix_memalign(&p, alignof(FenceTime), byteCount)) {
		return nullptr;
		}
		return p;
		}

		void FenceTime::operator delete(void *p) {
		free(p);
		}

		FenceTime::FenceTime(const sp<Fence>& fence)
		: mState(((fence.get() != nullptr) && fence->isValid()) ?
		State::VALID : State::INVALID),

+0 −5

Original line number	Diff line number	Diff line
		@@ -113,11 +113,6 @@ public:

		void signalForTest(nsecs_t signalTime);

		// Override new and delete since this needs 8-byte alignment, which
		// is not guaranteed on x86.
		static void* operator new(size_t nbytes) noexcept;
		static void operator delete(void *p);

		private:
		// For tests only. If forceValidForTest is true, then getSignalTime will
		// never return SIGNAL_TIME_INVALID and isValid will always return true.