Merge "Remove unnecessary handling of nil paths in HiddenAPIOutput" am: 38788dce43 am: b4186d80f1 am: 2874b49915 am: 3a457a9489

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1772630

Change-Id: Ifc18ccf1f2a85d1ad001e80cce231de886822dfa
diff --git a/android/neverallow.go b/android/neverallow.go
index 19b58a7..fa19009 100644
--- a/android/neverallow.go
+++ b/android/neverallow.go
@@ -175,6 +175,7 @@
 		"tools/test/graphicsbenchmark/apps/sample_app",
 		"tools/test/graphicsbenchmark/functional_tests/java",
 		"vendor/xts/gts-tests/hostsidetests/gamedevicecert/apps/javatests",
+		"external/libtextclassifier/native",
 	}
 
 	platformVariantPropertiesAllowedList := []string{
diff --git a/cc/config/vndk.go b/cc/config/vndk.go
index 2894f89..00e974c 100644
--- a/cc/config/vndk.go
+++ b/cc/config/vndk.go
@@ -59,6 +59,7 @@
 	"android.hardware.security.sharedsecret-V1-ndk_platform",
 	"android.hardware.security.sharedsecret-ndk_platform",
 	"android.hardware.security.sharedsecret-unstable-ndk_platform",
+	"android.hardware.soundtrigger3-V1-ndk_platform",
 	"android.hardware.vibrator-V1-ndk_platform",
 	"android.hardware.vibrator-V2-ndk_platform",
 	"android.hardware.vibrator-ndk_platform",