Merge remote-tracking branch 'origin/main'

Use P3 (D65) XYZ <-> RGB conversion matrix in display-p3
sample instead of the one currently being used, which is
for P3 (DCI) XYZ <-> RGB conversion.

BTW, all the matrices in display-p3 sample are updated to
high precision floats (rounded to 10 decimal digits).

 Author:    Tony Guo <tony.guo.peng@gmail.com>
 Date:      Mon Mar 21 12:39:34 2022 +0800

audio-echo/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.google.sample.echo'

audio-echo/build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -16,6 +16,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

bitmap-plasma/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig.with {
         applicationId 'com.example.plasma'

bitmap-plasma/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

builder/build.gradle

@@ -1,7 +1,8 @@
 apply plugin: 'java'
 
 repositories {
-    jcenter()
+    google()
+    mavenCentral()
 }
 
 dependencies {

camera/basic/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.sample.camera.basic'

camera/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

camera/texture-view/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId "com.sample.textureview"

display-p3/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,7 +12,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

display-p3/image-view/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId = 'com.example.widecolor'

display-p3/image-view/src/main/cpp/ColorSpaceTransform.cpp

@@ -50,7 +50,7 @@ static void CreateGammaEncodeTable(float gamma, std::vector<uint8_t>& table) {
   }
 }
 /*
- * CreateGammaEncodeTable()
+ * CreateGammaDecodeTable()
  *    Retrieve linear RGB data
  *    Linear =  sRGB / 12.92    0 <= sRGB < 0.04045
  *              pow((sRGB + 0.055)/1.055, gamma)
@@ -228,26 +228,26 @@ static mathfu::mat3 defaultNPMs[] =  {
      *         Algorithms and Interfaces
      *      Charles Poynton
      */
-    mathfu::mat3(0.412453f, 0.212671f, 0.019334f,
+    mathfu::mat3(0.4123908281f, 0.2126390338f, 0.0193308201f,
-                 0.357580f, 0.715160f, 0.119193f,
+                 0.3575843275f, 0.7151686549f, 0.1191947237f,
-                 0.180423f, 0.072169f, 0.950227f),
+                 0.1804807931f, 0.0721923113f, 0.9505321383f),
     // XYZ --> SRGB white reference point D65
-    mathfu::mat3( 3.240479f, -0.969256f, 0.055648f,
+    mathfu::mat3( 3.2409696579f, -0.9692436457f,  0.0556300320f,
-                  -1.537150f, 1.875992f, -0.204043f,
+                 -1.5373830795f,  1.8759675026f, -0.2039768547f,
-                  -0.498535f, 0.041556f, 1.057311f),
+                 -0.4986107349f,  0.0415550880f,  1.0569714308f),
     /* P3 --> XYZ, white reference point D65
      *     SMTP EG 432-1:2010, p23
      */
-    mathfu::mat3(0.4551698156f, 0.2094916779f, 0.000000000f,
+    mathfu::mat3(0.4865709245f, 0.2289745510f, 0.0000000000f,
-                 0.2771344092f, 0.7215952542f, 0.0470605601f,
+                 0.2656676769f, 0.6917385459f, 0.0451133996f,
-                 0.1722826698f, 0.0689130679f, 0.9073553944f),
+                 0.1982172877f, 0.0792869106f, 1.0439443588f),
     /*
      * CIE XYZ --> Display P3, white reference point D65. Source
      *     SMTP EG 432-1:2010, p24
      */
-    mathfu::mat3(2.7253940305f, -0.7951680258f, 0.0412418914f,
+    mathfu::mat3( 2.4934973717f, -0.8294889927f,  0.0358458459f,
-                -1.0180030062f, 1.6897320548f, -0.0876390192f,
+                 -0.9313836098f,  1.7626641989f, -0.0761724263f,
-                -0.4401631952f, 0.0226471906f, 1.1009293786f),
+                 -0.4027108550f,  0.0236246940f,  0.9568846226f),
 };
 const mathfu::mat3* GetTransformNPM(NPM_TYPE type) {
   ASSERT(type < NPM_TYPE::TYPE_COUNT, "NPM_TYPE (%d) out of bounds", type);

endless-tunnel/app/build.gradle

@@ -18,7 +18,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.google.sample.tunnel'

endless-tunnel/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

gles3jni/app/build.gradle

@@ -6,7 +6,7 @@ def platformVersion = 24      // openGLES 3.2 min api level
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.android.gles3jni'

gles3jni/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

hello-gl2/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
     
     defaultConfig {
         applicationId 'com.android.gl2jni'

hello-gl2/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

hello-jni/README.md

@@ -7,7 +7,7 @@ For how to use Android Studio, refer to [Hello-CMake codelab](https://codelabs.d
 
 Pre-requisites
 --------------
-- Android Studio 2.2+ with [NDK](https://developer.android.com/ndk/) bundle.
+- Android Studio 4.2+ with [NDK](https://developer.android.com/ndk/) bundle.
 
 Getting Started
 ---------------
@@ -16,7 +16,7 @@ Getting Started
 1. Open the sample directory.
 1. Open *File/Project Structure...*
   - Click *Download* or *Select NDK location*.
-1. Click *Tools/Android/Sync Project with Gradle Files*.
+1. Click *File/Sync Project with Gradle Files*.
 1. Click *Run/Run 'app'*.
 
 Screenshots
@@ -35,7 +35,7 @@ submitting a pull request through GitHub. Please see [CONTRIBUTING.md](../CONTRI
 
 License
 -------
-Copyright 2015 Google, Inc.
+Copyright 2022 Google, Inc.
 
 Licensed to the Apache Software Foundation (ASF) under one or more contributor
 license agreements.  See the NOTICE file distributed with this work for

hello-jni/app/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.example.hellojni'

hello-jni/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     ext.kotlin_version = '1.3.72'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -18,7 +18,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

hello-jniCallback/README.md

@@ -1,6 +1,6 @@
 Hello JNI Callback
 ==================
-This sample is an Aadd-on to Hello JNI sample to demonstrate calling back to Java from C code
+This sample is an add-on to Hello JNI sample to demonstrate calling back to Java from C code
 - create a java class instance from C code
 - call java class static and non-static member functions
 

hello-jniCallback/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
     
     defaultConfig {
         applicationId 'com.example.hellojnicallback'

hello-jniCallback/build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -16,7 +16,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

hello-libs/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId = 'com.example.hellolibs'

hello-libs/build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -16,7 +16,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

hello-libs/gen-libs/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         minSdkVersion 14

hello-neon/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
     
     defaultConfig {
         applicationId "com.example.helloneon"

hello-neon/build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -16,7 +16,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

hello-oboe/app/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
     
     defaultConfig {
         applicationId "com.google.example.hellooboe"

hello-oboe/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     ext.kotlin_version = '1.3.72'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         
     }
     dependencies {
@@ -18,7 +18,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

native-activity/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId = 'com.example.native_activity'

native-activity/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,7 +12,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

native-audio/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
      compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
      defaultConfig {
         applicationId 'com.example.nativeaudio'

native-audio/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

native-codec/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.example.nativecodec'

native-codec/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

native-media/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.example.nativemedia'

native-media/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

native-midi/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
     
     defaultConfig {
         applicationId "com.example.nativemidi"

native-midi/build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         
     }
     dependencies {
@@ -17,7 +17,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         
     }
 }

native-plasma/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.example.native_plasma'

native-plasma/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

nn-samples/basic/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion 30
     buildToolsVersion '30.0.0'
-    ndkVersion '21.3.6528147'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId "com.example.android.basic"

nn-samples/basic/src/main/cpp/nn_sample.cpp

@@ -44,15 +44,8 @@ Java_com_example_android_basic_MainActivity_initModel(
         return 0;
     }
     env->ReleaseStringUTFChars(_assetName, assetName);
-    off_t offset, length;
+    SimpleModel* nn_model = new SimpleModel(asset);
-    int fd = AAsset_openFileDescriptor(asset, &offset, &length);
     AAsset_close(asset);
-    if (fd < 0) {
-        __android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
-                            "Failed to open the model_data file descriptor.");
-        return 0;
-    }
-    SimpleModel* nn_model = new SimpleModel(length, PROT_READ, fd, offset);
     if (!nn_model->CreateCompiledModel()) {
         __android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
                             "Failed to prepare the model.");

nn-samples/basic/src/main/cpp/simple_model.cpp

@@ -15,41 +15,81 @@
  */
 #include "simple_model.h"
 
+#include <android/asset_manager_jni.h>
 #include <android/log.h>
 #include <android/sharedmem.h>
 #include <sys/mman.h>
 #include <string>
 #include <unistd.h>
 
+namespace {
+
+// Create ANeuralNetworksMemory from an asset file.
+//
+// Note that, at API level 30 or earlier, the NNAPI drivers may not have the permission to
+// access the asset file. To work around this issue, here we will:
+// 1. Allocate a large-enough shared memory to hold the model data;
+// 2. Copy the asset file to the shared memory;
+// 3. Create the NNAPI memory with the file descriptor of the shared memory.
+ANeuralNetworksMemory *createMemoryFromAsset(AAsset *asset) {
+    // Allocate a large-enough shared memory to hold the model data.
+    off_t length = AAsset_getLength(asset);
+    int fd = ASharedMemory_create("model_data", length);
+    if (fd < 0) {
+        __android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
+                            "ASharedMemory_create failed with size %d", length);
+        return nullptr;
+    }
+
+    // Copy the asset file to the shared memory.
+    void *data = mmap(nullptr, length, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+    if (data == nullptr) {
+        __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, "Failed to map a shared memory");
+        close(fd);
+        return nullptr;
+    }
+    AAsset_read(asset, data, length);
+    munmap(data, length);
+
+    // Create the NNAPI memory with the file descriptor of the shared memory.
+    ANeuralNetworksMemory *memory;
+    int status = ANeuralNetworksMemory_createFromFd(length, PROT_READ | PROT_WRITE, fd, 0,
+                                                    &memory);
+
+    // It is safe to close the file descriptor here because ANeuralNetworksMemory_createFromFd
+    // will create a dup.
+    close(fd);
+    if (status != ANEURALNETWORKS_NO_ERROR) {
+        __android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
+                            "ANeuralNetworksMemory_createFromFd failed for trained weights");
+        return nullptr;
+    }
+    return memory;
+}
+
+}  // namespace
+
 /**
  * SimpleModel Constructor.
  *
  * Initialize the member variables, including the shared memory objects.
  */
-SimpleModel::SimpleModel(size_t size, int protect, int fd, size_t offset) :
+SimpleModel::SimpleModel(AAsset *asset) :
         model_(nullptr),
         compilation_(nullptr),
-        dimLength_(TENSOR_SIZE),
+        dimLength_(TENSOR_SIZE) {
-        offset_(offset),
-        modelDataFd_(fd) {
     tensorSize_ = dimLength_;
     inputTensor1_.resize(tensorSize_);
 
     // Create ANeuralNetworksMemory from a file containing the trained data.
-    int32_t status = ANeuralNetworksMemory_createFromFd(size + offset, protect, fd, 0,
+    memoryModel_ = createMemoryFromAsset(asset);
-                                                        &memoryModel_);
-    if (status != ANEURALNETWORKS_NO_ERROR) {
-        __android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
-                            "ANeuralNetworksMemory_createFromFd failed for trained weights");
-        return;
-    }
 
     // Create ASharedMemory to hold the data for the second input tensor and output output tensor.
     inputTensor2Fd_ = ASharedMemory_create("input2", tensorSize_ * sizeof(float));
     outputTensorFd_ = ASharedMemory_create("output", tensorSize_ * sizeof(float));
 
     // Create ANeuralNetworksMemory objects from the corresponding ASharedMemory objects.
-    status = ANeuralNetworksMemory_createFromFd(tensorSize_ * sizeof(float),
+    int status = ANeuralNetworksMemory_createFromFd(tensorSize_ * sizeof(float),
                                                     PROT_READ,
                                                     inputTensor2Fd_, 0,
                                                     &memoryInput2_);
@@ -179,7 +219,7 @@ bool SimpleModel::CreateCompiledModel() {
     status = ANeuralNetworksModel_setOperandValueFromMemory(model_,
                                                             tensor0,
                                                             memoryModel_,
-                                                            offset_,
+                                                            0,
                                                             tensorSize_ * sizeof(float));
     if (status != ANEURALNETWORKS_NO_ERROR) {
         __android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
@@ -210,7 +250,7 @@ bool SimpleModel::CreateCompiledModel() {
         return false;
     }
     status = ANeuralNetworksModel_setOperandValueFromMemory(
-            model_, tensor2, memoryModel_, offset_ + tensorSize_ * sizeof(float),
+            model_, tensor2, memoryModel_, tensorSize_ * sizeof(float),
             tensorSize_ * sizeof(float));
     if (status != ANEURALNETWORKS_NO_ERROR) {
         __android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
@@ -504,5 +544,4 @@ SimpleModel::~SimpleModel() {
     ANeuralNetworksMemory_free(memoryOutput_);
     close(inputTensor2Fd_);
     close(outputTensorFd_);
-    close(modelDataFd_);
 }

nn-samples/basic/src/main/cpp/simple_model.h

@@ -17,6 +17,7 @@
 #ifndef NNAPI_SIMPLE_MODEL_H
 #define NNAPI_SIMPLE_MODEL_H
 
+#include <android/asset_manager_jni.h>
 #include <android/NeuralNetworks.h>
 #include <vector>
 
@@ -38,7 +39,7 @@
  */
 class SimpleModel {
 public:
-    explicit SimpleModel(size_t size, int protect, int fd, size_t offset);
+    explicit SimpleModel(AAsset* asset);
     ~SimpleModel();
 
     bool CreateCompiledModel();
@@ -53,10 +54,8 @@ private:
 
     uint32_t dimLength_;
     uint32_t tensorSize_;
-    size_t offset_;
 
     std::vector<float> inputTensor1_;
-    int modelDataFd_;
     int inputTensor2Fd_;
     int outputTensorFd_;
 };

nn-samples/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     ext.kotlin_version = '1.3.72'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -18,7 +18,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

nn-samples/sequence/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 30
     buildToolsVersion '30.0.0'
-    ndkVersion '21.3.6528147'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId "com.example.android.sequence"

other-builds/ndkbuild/bitmap-plasma/app/build.gradle

@@ -6,7 +6,7 @@ def REMOTE_PROJ_ROOT = '../../../../' + rootProject.getName() + '/' +
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId "com.example.plasma"

other-builds/ndkbuild/bitmap-plasma/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

other-builds/ndkbuild/gles3jni/app/build.gradle

@@ -13,7 +13,7 @@ def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' +
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.android.gles3jni'

other-builds/ndkbuild/gles3jni/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

other-builds/ndkbuild/hello-gl2/app/build.gradle

@@ -5,7 +5,7 @@ def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' +
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
     
     defaultConfig {
         applicationId 'com.android.gl2jni'

other-builds/ndkbuild/hello-gl2/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

other-builds/ndkbuild/hello-jni/app/build.gradle

@@ -7,7 +7,7 @@ def REMOTE_PROJ_ROOT = '../../../../' + rootProject.getName() + '/' +
                         project.getName() + '/src/main'
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId "com.example.hellojni"

other-builds/ndkbuild/hello-jni/build.gradle

@@ -3,7 +3,7 @@ buildscript {
     ext.kotlin_version = '1.3.72'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -14,7 +14,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

other-builds/ndkbuild/hello-libs/app/build.gradle

@@ -10,7 +10,7 @@ def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' +
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId = 'com.example.hellolibs'

other-builds/ndkbuild/hello-libs/build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -16,7 +16,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

other-builds/ndkbuild/hello-neon/app/build.gradle

@@ -5,7 +5,7 @@ def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' +
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
     
     defaultConfig {
         applicationId "com.example.helloneon"

other-builds/ndkbuild/hello-neon/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

other-builds/ndkbuild/native-activity/app/build.gradle

@@ -6,7 +6,7 @@ def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' +
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId = 'com.example.native_activity'

other-builds/ndkbuild/native-activity/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

other-builds/ndkbuild/native-audio/app/build.gradle

@@ -5,7 +5,7 @@ def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' +
 
 android {
      compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
      defaultConfig {
         applicationId 'com.example.nativeaudio'

other-builds/ndkbuild/native-audio/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

other-builds/ndkbuild/native-codec/app/build.gradle

@@ -6,7 +6,7 @@ def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' +
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.example.nativecodec'

other-builds/ndkbuild/native-codec/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

other-builds/ndkbuild/native-media/app/build.gradle

@@ -5,7 +5,7 @@ def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' +
 
 android {
      compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
      defaultConfig {
         applicationId 'com.example.nativemedia'

other-builds/ndkbuild/native-media/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

other-builds/ndkbuild/native-plasma/app/build.gradle

@@ -6,7 +6,7 @@ def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' +
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.example.native_plasma'

other-builds/ndkbuild/native-plasma/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

other-builds/ndkbuild/nn-samples/basic/build.gradle

@@ -8,7 +8,7 @@ def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' +
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId "com.example.android.basic"

other-builds/ndkbuild/nn-samples/build.gradle

@@ -3,7 +3,7 @@ buildscript {
     ext.kotlin_version = '1.3.72'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -14,6 +14,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

other-builds/ndkbuild/san-angeles/app/build.gradle

@@ -11,7 +11,7 @@ ext.versionCodes = ['armeabi-v7a':1, 'arm64-v8a':2, 'x86':3]
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.example.SanAngeles'

other-builds/ndkbuild/san-angeles/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

other-builds/ndkbuild/teapots/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

other-builds/ndkbuild/teapots/classic-teapot/build.gradle

@@ -6,7 +6,7 @@ def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' +
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId "com.sample.teapot"

other-builds/ndkbuild/teapots/more-teapots/build.gradle

@@ -6,7 +6,7 @@ def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' +
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId "com.sample.moreteapots"

other-builds/ndkbuild/two-libs/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId "com.example.twolibs"

other-builds/ndkbuild/two-libs/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

prefab/curl-ssl/app/build.gradle

@@ -22,7 +22,7 @@ plugins {
 
 android {
     compileSdkVersion 30
-    ndkVersion '21.3.6528147'
+    ndkVersion '22.1.7171670'
     defaultConfig {
         applicationId "com.example.curlssl"
         minSdkVersion 21
@@ -65,7 +65,7 @@ dependencies {
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:30.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation "com.android.ndk.thirdparty:curl:7.69.1-alpha-1"
+    implementation "com.android.ndk.thirdparty:curl:7.79.1-beta-1"
-    implementation "com.android.ndk.thirdparty:jsoncpp:1.8.4-alpha-1"
+    implementation "com.android.ndk.thirdparty:jsoncpp:1.9.5-beta-1"
-    implementation "com.android.ndk.thirdparty:openssl:1.1.1g-alpha-1"
+    implementation "com.android.ndk.thirdparty:openssl:1.1.1l-beta-1"
 }

prefab/curl-ssl/build.gradle

@@ -18,7 +18,7 @@ buildscript {
     ext.kotlin_version = '1.3.61'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -29,7 +29,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

prefab/prefab-dependency/app/build.gradle

@@ -29,7 +29,7 @@ android {
         applicationId "com.example.com.example.prefabdependency"
         minSdkVersion 21
         targetSdkVersion 30
-        ndkVersion "21.3.6528147"
+        ndkVersion '22.1.7171670'
         versionCode 1
         versionName "1.0"
 

prefab/prefab-dependency/build.gradle

@@ -18,7 +18,7 @@ buildscript {
     ext.kotlin_version = '1.3.61'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -29,7 +29,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

prefab/prefab-publishing/build.gradle

@@ -17,7 +17,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -27,7 +27,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

prefab/prefab-publishing/mylibrary/build.gradle

@@ -20,7 +20,7 @@ plugins {
 
 android {
     compileSdkVersion 30
-    ndkVersion '21.3.6528147'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         minSdkVersion 16

san-angeles/app/build.gradle

@@ -7,7 +7,7 @@ ext.versionCodes = ['armeabi-v7a':1, 'arm64-v8a':2, 'mips':3, 'x86':4]
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.example.SanAngeles'

san-angeles/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

sensor-graph/accelerometer/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.android.accelerometergraph'

sensor-graph/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

teapots/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

teapots/choreographer-30fps/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 30
     buildToolsVersion '30.0.0'
-    ndkVersion '21.3.6528147'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.sample.choreographer'

teapots/classic-teapot/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 30
     buildToolsVersion '30.0.0'
-    ndkVersion '21.3.6528147'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId = 'com.sample.teapot'

teapots/image-decoder/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 30
     buildToolsVersion '30.0.0'
-    ndkVersion '21.3.6528147'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId = 'com.sample.imagedecoder'

teapots/more-teapots/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 30
     buildToolsVersion '30.0.0'
-    ndkVersion '21.3.6528147'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId  'com.sample.moreteapots'

teapots/textured-teapot/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 30
     buildToolsVersion '30.0.0'
-    ndkVersion '21.3.6528147'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId = 'com.sample.texturedteapot'

webp/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

webp/view/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    ndkVersion '21.2.6472646'
+    ndkVersion '22.1.7171670'
 
     defaultConfig {
         applicationId 'com.example.webp_view'