Merge "Map execution failure error status from driver through NN API to client."
diff --git a/nn/runtime/Android.bp b/nn/runtime/Android.bp
index d3c9824..06e6cf9 100644
--- a/nn/runtime/Android.bp
+++ b/nn/runtime/Android.bp
@@ -99,3 +99,9 @@
// Android O-MR1
first_version: "27",
}
+
+llndk_library {
+ name: "libneuralnetworks",
+ symbol_file: "libneuralnetworks.map.txt",
+ export_include_dirs: ["include"],
+}
diff --git a/nn/runtime/Callbacks.h b/nn/runtime/Callbacks.h
index ddd5700..fb9b29d 100644
--- a/nn/runtime/Callbacks.h
+++ b/nn/runtime/Callbacks.h
@@ -54,10 +54,6 @@
* "notify". This "notify" call awakens any client threads waiting on the
* callback object.
*
- * callback object. When the asynchronous task has finished its workload or has
- * failed to launch, it must immediately call "notify", awakening any client
- * threads waiting on the callback object.
- *
* The CallbackBase class implements some of the base synchronization common to
* both PrepareModelCallback and ExecutionCallback. For consistency, any HIDL
* callback class must inherit from CallbackBase as well as the HIDL callback
diff --git a/nn/runtime/include/NeuralNetworks.h b/nn/runtime/include/NeuralNetworks.h
index af21f3b..e1f3fc9 100644
--- a/nn/runtime/include/NeuralNetworks.h
+++ b/nn/runtime/include/NeuralNetworks.h
@@ -1927,7 +1927,7 @@
const uint32_t* outputs);
/**
- * Specfifies which operands will be the model's inputs and outputs.
+ * Specifies which operands will be the model's inputs and outputs.
*
* An operand cannot be used for both input and output. Doing so will
* return an error.
