Merge "ultrahdr: Renamed and disabled build targets" into main (fe5ca00c) · Commits · e / os / platform_frameworks_native

libs/ultrahdr/Android.bp

+6 −3

Original line number	Diff line number	Diff line
		@@ -21,7 +21,8 @@ package {
		}

		cc_library {
		name: "libultrahdr",
		name: "libultrahdr-deprecated",
		enabled: false,
		host_supported: true,
		vendor_available: true,
		export_include_dirs: ["include"],
		@@ -46,7 +47,8 @@ cc_library {
		}

		cc_library {
		name: "libjpegencoder",
		name: "libjpegencoder-deprecated",
		enabled: false,
		host_supported: true,
		vendor_available: true,

		@@ -64,7 +66,8 @@ cc_library {
		}

		cc_library {
		name: "libjpegdecoder",
		name: "libjpegdecoder-deprecated",
		enabled: false,
		host_supported: true,
		vendor_available: true,

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		// limitations under the License.

		license {
		name: "adobe_hdr_gain_map_license",
		name: "adobe_hdr_gain_map_license-deprecated",
		license_kinds: ["legacy_by_exception_only"],
		license_text: ["NOTICE"],
		}

+6 −3

Original line number	Diff line number	Diff line
		@@ -22,7 +22,8 @@ package {
		}

		cc_defaults {
		name: "ultrahdr_fuzzer_defaults",
		name: "ultrahdr_fuzzer_defaults-deprecated",
		enabled: false,
		host_supported: true,
		shared_libs: [
		"libimage_io",
		@@ -53,7 +54,8 @@ cc_defaults {
		}

		cc_fuzz {
		name: "ultrahdr_enc_fuzzer",
		name: "ultrahdr_enc_fuzzer-deprecated",
		enabled: false,
		defaults: ["ultrahdr_fuzzer_defaults"],
		srcs: [
		"ultrahdr_enc_fuzzer.cpp",
		@@ -61,7 +63,8 @@ cc_fuzz {
		}

		cc_fuzz {
		name: "ultrahdr_dec_fuzzer",
		name: "ultrahdr_dec_fuzzer-deprecated",
		enabled: false,
		defaults: ["ultrahdr_fuzzer_defaults"],
		srcs: [
		"ultrahdr_dec_fuzzer.cpp",

+2 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,8 @@ package {
		}

		cc_test {
		name: "ultrahdr_unit_test",
		name: "ultrahdr_unit_test-deprecated",
		enabled: false,
		test_suites: ["device-tests"],
		srcs: [
		"gainmapmath_test.cpp",