Merge "Disable NNAPI host build"
diff --git a/nn/common/Android.bp b/nn/common/Android.bp
index 10f97a2..c600043 100644
--- a/nn/common/Android.bp
+++ b/nn/common/Android.bp
@@ -242,7 +242,8 @@
cc_defaults {
name: "neuralnetworks_utils_defaults",
- host_supported: true,
+ // b/146324523, NNAPI host build capability
+ host_supported: false,
vendor_available: true,
apex_available: [
"//apex_available:platform",
diff --git a/nn/runtime/test/Android.bp b/nn/runtime/test/Android.bp
index ac53b9a..78bfb89 100644
--- a/nn/runtime/test/Android.bp
+++ b/nn/runtime/test/Android.bp
@@ -393,7 +393,8 @@
cc_defaults {
name: "neuralnetworks_generated_defaults",
defaults: ["neuralnetworks_float16"],
- host_supported: true,
+ // b/146324523, NNAPI host build capability
+ host_supported: false,
vendor_available: true,
static_libs: ["libneuralnetworks_generated_test_harness"],
}