Merge "libjpegrecoverymap: fix dependencies" (df6cd61a) · Commits · e / os / android_frameworks_native

libs/jpegrecoverymap/Android.bp

+9 −4

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ package {
		default_applicable_licenses: ["frameworks_native_license"],
		}

		cc_library_static {
		cc_library {
		name: "libjpegrecoverymap",
		host_supported: true,

		@@ -37,15 +37,18 @@ cc_library_static {
		shared_libs: [
		"libimage_io",
		"libjpeg",
		"libutils",
		"libjpegencoder",
		"libjpegdecoder",
		],
		}

		cc_library_static {
		cc_library {
		name: "libjpegencoder",
		host_supported: true,

		shared_libs: [
		"libjpeg",
		"liblog",
		],

		export_include_dirs: ["include"],
		@@ -55,11 +58,13 @@ cc_library_static {
		],
		}

		cc_library_static {
		cc_library {
		name: "libjpegdecoder",
		host_supported: true,

		shared_libs: [
		"libjpeg",
		"liblog",
		],

		export_include_dirs: ["include"],

+1 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ enum {
		ERROR_JPEGR_RESOLUTION_MISMATCH = JPEGR_IO_ERROR_BASE - 3,
		ERROR_JPEGR_BUFFER_TOO_SMALL = JPEGR_IO_ERROR_BASE - 4,
		ERROR_JPEGR_INVALID_COLORGAMUT = JPEGR_IO_ERROR_BASE - 5,
		ERROR_JPEGR_INVALID_TRANS_FUNC = JPEGR_IO_ERROR_BASE - 6,

		JPEGR_RUNTIME_ERROR_BASE = -20000,
		ERROR_JPEGR_ENCODE_ERROR = JPEGR_RUNTIME_ERROR_BASE - 1,

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ typedef enum {

		// Transfer functions as defined for XMP metadata
		typedef enum {
		JPEGR_TF_UNSPECIFIED = -1,
		JPEGR_TF_LINEAR = 0,
		JPEGR_TF_HLG = 1,
		JPEGR_TF_PQ = 2,

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		#include <jpegrecoverymap/jpegdecoder.h>

		#include <cutils/log.h>
		#include <utils/Log.h>

		#include <errno.h>
		#include <setjmp.h>

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		#include <jpegrecoverymap/jpegencoder.h>

		#include <cutils/log.h>
		#include <utils/Log.h>

		#include <errno.h>