diff options
| author | Xin Li <delphij@google.com> | 2020-08-27 10:16:40 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-08-27 10:16:40 -0700 |
| commit | 0f001978ae64388e25b9c96bb1f8abe17243bee9 (patch) | |
| tree | e291eb529a8330f89044fe36674afc99a80e6f0f | |
| parent | 4904fd64aedb9c2ff0b83a76c9678eab408f9140 (diff) | |
| parent | ba29793b169a90f611a7ac37652850d61fece598 (diff) | |
| download | ml-0f001978ae64388e25b9c96bb1f8abe17243bee9.tar.gz | |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I13b7a5e6dfd2e81134a0782d0d151babbdd91f0c
Change-Id: I2bbcbe0d8df394ee8417ec521cd853a384c658ba
| -rw-r--r-- | nn/apex/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | nn/apex/manifest.json | 2 | ||||
| -rw-r--r-- | nn/runtime/test/TestExecution.cpp | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/nn/apex/AndroidManifest.xml b/nn/apex/AndroidManifest.xml index 255d2a501..70c9f73aa 100644 --- a/nn/apex/AndroidManifest.xml +++ b/nn/apex/AndroidManifest.xml @@ -18,12 +18,4 @@ package="com.android.neuralnetworks"> <!-- APEX does not have classes.dex --> <application android:hasCode="false" /> - <!-- - * API levels the NeuralNetworks APEX is known to work with. - --> - <uses-sdk - android:minSdkVersion="29" - android:maxSdkVersion="30" - android:targetSdkVersion="30" - /> </manifest> diff --git a/nn/apex/manifest.json b/nn/apex/manifest.json index 4f7084089..963ef8717 100644 --- a/nn/apex/manifest.json +++ b/nn/apex/manifest.json @@ -1,4 +1,4 @@ { "name": "com.android.neuralnetworks", - "version": 1 + "version": 300000000 } diff --git a/nn/runtime/test/TestExecution.cpp b/nn/runtime/test/TestExecution.cpp index 2dc29ae33..66bef6b2a 100644 --- a/nn/runtime/test/TestExecution.cpp +++ b/nn/runtime/test/TestExecution.cpp @@ -423,7 +423,7 @@ class TestDriver13 : public SampleDriver { actualCallback); } -private: + private: ErrorStatus mErrorStatus; }; |