Make libhardware_headers available for native_bridge am: 8abec648ca am: 32813ef904 am: cf7e90b146
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12128050
Change-Id: I982ae09b700202dcb96a032d05255239511dcd24
diff --git a/Android.bp b/Android.bp
index 0b340a1..3ac123e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,6 +29,7 @@
},
},
min_sdk_version: "29",
+ host_supported: true,
}
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+ license_type: NOTICE
+}
diff --git a/include/hardware/audio_alsaops.h b/include/hardware/audio_alsaops.h
index 6a17a35..476c311 100644
--- a/include/hardware/audio_alsaops.h
+++ b/include/hardware/audio_alsaops.h
@@ -60,7 +60,7 @@
case AUDIO_FORMAT_PCM_FLOAT: /* there is no equivalent for float */
default:
LOG_ALWAYS_FATAL("pcm_format_from_audio_format: invalid audio format %#x", format);
- return 0;
+ return PCM_FORMAT_INVALID; /* doesn't get here, assert called above */
}
}
@@ -94,7 +94,7 @@
#endif
default:
LOG_ALWAYS_FATAL("audio_format_from_pcm_format: invalid pcm format %#x", format);
- return 0;
+ return AUDIO_FORMAT_INVALID; /* doesn't get here, assert called above */
}
}
diff --git a/modules/input/evdev/Android.bp b/modules/input/evdev/Android.bp
index 26e711f..bcd563f 100644
--- a/modules/input/evdev/Android.bp
+++ b/modules/input/evdev/Android.bp
@@ -27,6 +27,7 @@
"SwitchInputMapper.cpp",
],
+ header_libs: ["jni_headers"],
shared_libs: [
"libhardware_legacy",
"liblog",