Merge "Snap for 6660490 from bbdbd7856af12fd3bc063225fa364510d8608ea0 to sdk-release" into sdk-releaseplatform-tools-30.0.4

3 files changed, 5 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 15f27428..3ac123e4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,6 +18,8 @@ cc_library_headers {
     export_include_dirs: ["include"],
     recovery_available: true,
     vendor_available: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     target: {
         recovery: {
             exclude_header_libs: [
diff --git a/include/hardware/audio_alsaops.h b/include/hardware/audio_alsaops.h
index 6a17a351..476c311f 100644
--- a/include/hardware/audio_alsaops.h
+++ b/include/hardware/audio_alsaops.h
@@ -60,7 +60,7 @@ static inline enum pcm_format pcm_format_from_audio_format(audio_format_t format
     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 @@ static inline audio_format_t audio_format_from_pcm_format(enum pcm_format format
 #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 26e711fd..bcd563f0 100644
--- a/modules/input/evdev/Android.bp
+++ b/modules/input/evdev/Android.bp
@@ -27,6 +27,7 @@ cc_library_shared {
         "SwitchInputMapper.cpp",
     ],
 
+    header_libs: ["jni_headers"],
     shared_libs: [
         "libhardware_legacy",
         "liblog",