APL-Viewhost: March 2022 Release of APL 1.9 compilant Android Viewhos…

…t(1.9.1)

Config

@@ -0,0 +1,41 @@
+# -*-perl-*-
+
+package.APLViewhostAndroid = {
+    interfaces = (1.9);
+
+    deploy = {
+        generic = true;
+    };
+
+    build-environment = {
+        chroot = basic;
+        network-access = open;
+    };
+
+    build-system = custom-build;
+    build-tools = {
+        1.9 = {
+            BrazilPath = 1.1;
+            ContainerBuild = 1.2;
+            ContainerBuildServerAPLKeys = 1.0;
+        };
+    };
+
+    dependencies = {
+        1.9 = {
+            APLCoreEngine = 1.9;
+        };
+    };
+
+    test-dependencies = {
+      1.9 = {
+          # build-tools defined here will be mapped to /opt/build-tools/PackageName inside the build container and added to PATH
+      };
+    };
+
+    runtime-dependencies = {
+        1.9 = {
+        };
+    };
+
+};

apl/CMakeLists.txt

@@ -51,6 +51,7 @@ add_library(
         src/main/cpp/jniextensioncomponent.cpp
         src/main/cpp/jniextensioneventhandler.cpp
         src/main/cpp/jniextensionfilter.cpp
+        src/main/cpp/jniextensionmediator.cpp
         src/main/cpp/jnirootcontext.cpp
         src/main/cpp/jnirootconfig.cpp
         src/main/cpp/jnicomponent.cpp

apl/build.gradle

@@ -5,22 +5,22 @@
 
 apply plugin: 'com.android.library'
 apply plugin: 'jacoco'
+apply plugin: 'maven-publish'
 
 jacoco {
     toolVersion = '0.8.2'
 }
 
 tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
-    jacoco.excludes = ['jdk.internal.ff*']
+    jacoco.excludes = ['jdk.internal.*']
 }
 
-
 task jacocoTestReport(type: JacocoReport, dependsOn: ['test']) {
     def mainSrc = "$project.projectDir/src/main/java"
 
-    def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*']
-    def debugTree = fileTree(dir: "$project.buildDir/intermediates/javac/debugUnitTest/", excludes: fileFilter)
+    def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', '**/AutoValue_*.*']
+    def debugTree = fileTree(dir: "$project.buildDir/intermediates/javac/release/", excludes: fileFilter)
 
     sourceDirectories.from(files([mainSrc]))
     classDirectories.from(files(debugTree))
@@ -30,8 +30,7 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['test']) {
     ]))
     reports {
         xml.enabled = true
-        xml.destination file("${buildDir}/../documentation/coverage.xml")
-        html.enabled = false
+        html.enabled = true
     }
 }
 
@@ -47,7 +46,8 @@ ext {
 
 android {
     compileSdkVersion 28
-    ndkVersion "22.0.7026061"
+    ndkVersion "23.0.7599858"
+    buildToolsVersion "30.0.2"
     defaultConfig {
         minSdkVersion 22
         targetSdkVersion 28
@@ -60,7 +60,7 @@ android {
             cmake {
                 // Sets optional flags for the C++ compiler.
                 // Enables RTTI (RunTime Type Information) support and C++ exceptions.
-                cppFlags "-std=c++11 -frtti -fexceptions"
+                cppFlags "-std=c++11", "-frtti", "-fexceptions", "-DBUILD_ALEXAEXTENSIONS=On", "-DALEXAEXTENSIONS=1"
                 // Build the APL Core JNI library (excludes all other targets)
                 targets "apl", "apl-jni"
                 // Enable APL Core JNI build, and be verbose.

apl/src/main/cpp/jniapl.cpp

@@ -44,10 +44,12 @@ namespace apl {
             jboolean graphicLoaded = graphic_OnLoad(vm, reserved);
             jboolean jniscalingLoaded = jniscaling_OnLoad(vm, reserved);
             jboolean textmeasureLoaded = textmeasurecallback_OnLoad(vm, reserved);
+            jboolean localExtensionMediatorLoaded = extensionmediator_OnLoad(vm, reserved);
 
             if (!driverLoaded || !contentLoaded || !rootconfigLoaded
                 || !complexpropertyLoaded || !eventLoaded || !actionLoaded || !graphicLoaded
-                || !jniutilLoaded || !jniscalingLoaded || !textmeasureLoaded)  {
+                || !jniutilLoaded || !jniscalingLoaded || !textmeasureLoaded
+                || !localExtensionMediatorLoaded)  {
                 return JNI_ERR;
             }
 
@@ -71,6 +73,7 @@ namespace apl {
             graphic_OnUnload(vm, reserved);
             jniutil_OnUnload(vm, reserved);
             textmeasurecallback_OnUnload(vm, reserved);
+            extensionmediator_OnUnload(vm, reserved);
         }
 
     } //namespace jni

apl/src/main/cpp/jnirootconfig.cpp

@@ -349,6 +349,26 @@ namespace apl {
             env->ReleaseStringUTFChars(name_, name);
         }
 
+        JNIEXPORT void JNICALL
+        Java_com_amazon_apl_android_RootConfig_nExtensionProvider(JNIEnv *env,
+                                                                  jclass clazz,
+                                                                  jlong nativeHandle,
+                                                                  jlong providerNativeHandle) {
+            auto rc = get<RootConfig>(nativeHandle);
+            auto ep = get<alexaext::ExtensionProvider>(providerNativeHandle);
+            rc->extensionProvider(ep);
+        }
+
+        JNIEXPORT void JNICALL
+        Java_com_amazon_apl_android_RootConfig_nExtensionMediator(JNIEnv *env,
+                                                                  jclass clazz,
+                                                                  jlong nativeHandle,
+                                                                  jlong mediatorNativeHandle) {
+            auto rc = get<RootConfig>(nativeHandle);
+            auto em = get<ExtensionMediator>(mediatorNativeHandle);
+            rc->extensionMediator(em);
+        }
+
         JNIEXPORT void JNICALL
         Java_com_amazon_apl_android_RootConfig_nRegisterExtensionEventHandler(JNIEnv *env,
                                                                               jclass clazz,

common/.cxx/abi_configuration_6r145855.json

@@ -0,0 +1,10 @@
+{
+  "allAbis": [
+    "armeabi-v7a",
+    "arm64-v8a",
+    "x86"
+  ],
+  "validAbis": [
+    "X86"
+  ]
+}

common/.cxx/abi_configuration_6r145855.log

@@ -0,0 +1 @@
+[]