Merge "Revert "Enable cfi in hevc library"" (cd13efa9) · Commits · e / os / android_frameworks_av

media/codec2/components/hevc/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -3,12 +3,12 @@ cc_library {
		defaults: [
		"libcodec2_soft-defaults",
		"libcodec2_soft_sanitize_signed-defaults",
		"libcodec2_soft_sanitize_cfi-defaults",
		],

		srcs: ["C2SoftHevcDec.cpp"],

		static_libs: ["libhevcdec"],

		}

		cc_library {
		@@ -16,10 +16,10 @@ cc_library {
		defaults: [
		"libcodec2_soft-defaults",
		"libcodec2_soft_sanitize_signed-defaults",
		"libcodec2_soft_sanitize_cfi-defaults",
		],

		srcs: ["C2SoftHevcEnc.cpp"],

		static_libs: ["libhevcenc"],

		}

+0 −7

Original line number	Diff line number	Diff line
		@@ -17,13 +17,6 @@ cc_library_shared {
		"signed-integer-overflow",
		],
		cfi: true,
		diag: {
		cfi: true,
		},
		config: {
		cfi_assembly_support: true,
		},

		},

		// We need this because the current asm generates the following link error: