Dphan/add android

.conform.yaml

@@ -37,4 +37,5 @@ policies:
           - "docs"
           - "cli"
           - "deps"
+          - "jni"
         descriptionLength: 72

README.md

@@ -39,3 +39,4 @@ The template offers the following feature switches which can be enabled during c
 * `monitor`: create a thin decorator class which can be used to log traffic going through API layer
 * `olink`: create the adaption layer for the [OLink](https://docs.apigear.io/docs/protocols/objectlink/intro) protocol. This can be used to connect to the simulation or other technologies like python, pure c++ etc..
 * `msgbus`: create the adaption layer for the [UE MsgBus](https://dev.epicgames.com/documentation/en-us/unreal-engine/API/Runtime/Messaging) protocol. This can be used for communication inside the same UE app or between different instances, including across network interfaces.
+* `jni`: create the jni adaption layer for the android messenger communication provided by apigear java template. Please read more on a separate document readme_jni.

goldenmaster/Plugins/Counter/Counter.uplugin

@@ -47,6 +47,11 @@
 			"Type": "Runtime",
 			"LoadingPhase": "default"
 		},
+		{
+			"Name": "CounterJni",
+			"Type": "Runtime",
+			"LoadingPhase": "default"
+		},
 		{
 			"Name" : "CounterEditor",
 			"Type" : "Editor",

goldenmaster/Plugins/Counter/Source/CounterCore/Private/Tests/CounterTestsCommon.cpp

@@ -19,4 +19,5 @@ limitations under the License.
 #include "Misc/AutomationTest.h"
 
 #if WITH_DEV_AUTOMATION_TESTS
+
 #endif // WITH_DEV_AUTOMATION_TESTS

goldenmaster/Plugins/Counter/Source/CounterJni/CounterJni.Build.cs

@@ -0,0 +1,78 @@
+using UnrealBuildTool;
+using System.IO;
+
+public class CounterJni : ModuleRules
+{
+	public CounterJni(ReadOnlyTargetRules Target) : base(Target)
+	{
+		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
+		#if UE_5_2_OR_LATER 
+			IWYUSupport = IWYUSupport.Full;
+		#else
+			bEnforceIWYU = true;
+		#endif
+
+		// Disable nlohmann::json exception handling
+		PublicDefinitions.Add("JSON_NOEXCEPTION=1");
+
+		PublicIncludePaths.AddRange(
+			new string[] {
+				// ... add public include paths required here ...
+			}
+			);
+
+
+		PrivateIncludePaths.AddRange(
+			new string[] {
+				// ... add other private include paths required here ...
+			}
+			);
+
+
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"CounterAPI",
+				"CounterCore",
+				"Projects",
+				"Engine",
+				"JsonUtilities",
+				"CustomTypesCore",
+				"CustomTypesJni", 
+				"ExternTypesCore",
+				"ExternTypesJni"
+			}
+			);
+
+
+		PrivateDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core",
+				"CoreUObject",
+				"Engine",
+				"CounterCore",
+				"CounterImplementation",
+				"CustomTypesAPI",
+				"ExternTypesAPI",
+			}
+			);
+
+		if (Target.Platform == UnrealTargetPlatform.Android)
+        {
+            PrivateDefinitions.Add("WITH_JNI=1");
+            string PluginPath = Utils.MakePathRelativeTo(ModuleDirectory, Target.RelativeEnginePath);
+            AdditionalPropertiesForReceipt.Add("AndroidPlugin", Path.Combine(PluginPath, "Counter_JNI_UPL.xml"));
+
+            PrivateDependencyModuleNames.AddRange(new string[] { "Launch" });
+        }
+
+
+		DynamicallyLoadedModuleNames.AddRange(
+			new string[]
+			{
+				// ... add any modules that your module loads dynamically here ...
+			}
+			);
+	}
+}

goldenmaster/Plugins/Counter/Source/CounterJni/Counter_JNI_UPL.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<root xmlns:android="http://schemas.android.com/apk/res/android">
+	<trace enable="true"/>
+	<init>
+		<log text="android counter init"/>
+	</init>
+
+	<androidManifestUpdates>
+		<addPermission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+		<addPermission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/> 
+		<addPermission android:name="counter.counter_android_service.PERMISSION_BIND"/>
+		<addElements tag="queries">
+				<package android:name="counter.counter_android_service" />
+		</addElements>
+
+		<addElements tag="application"><service 
+			android:name="counter.counter_android_service.CounterServiceAdapter"
+			android:enabled="true"
+			android:exported="true">
+		</service>
+		</addElements>
+
+	</androidManifestUpdates>
+
+	<resourceCopies>
+		<copyDir src="$S(PluginDir)/buildsystem" dst="$S(BuildDir)/gradle/buildsystem" />
+		<copyDir src="$S(PluginDir)/../../../../android/counter/counter_android_service" dst="$S(BuildDir)/JavaLibs/counter_android_service" />
+		<copyDir src="$S(PluginDir)/../../../../android/counter/counter_android_client" dst="$S(BuildDir)/JavaLibs/counter_android_client" />
+		<copyDir src="$S(PluginDir)/../../../../android/counter/counter_api" dst="$S(BuildDir)/JavaLibs/counter_api" />
+		<copyDir src="$S(PluginDir)/../../../../android/counter/counter_android_messenger" dst="$S(BuildDir)/JavaLibs/counter_android_messenger" />
+		<copyDir src="$S(PluginDir)/../../../../android/counter/counter_impl" dst="$S(BuildDir)/JavaLibs/counter_impl" />
+		<copyDir src="$S(PluginDir)/../../../../android/counter/counterjniservice" dst="$S(BuildDir)/src/counterjniservice" />
+		<copyDir src="$S(PluginDir)/../../../../android/counter/counterjniclient" dst="$S(BuildDir)/src/counterjniclient" />
+	</resourceCopies>
+
+	<baseBuildGradleAdditions>
+		<addElements tag="buildscript">
+			<insertValue value="apply from: 'buildsystem/config.gradle'"/>
+			<insertValue value="apply from: 'buildsystem/dependencies.gradle'"/>
+			<insertNewline/>
+		</addElements>
+	</baseBuildGradleAdditions>
+
+	<settingsGradleAdditions>
+		<insert>
+			<![CDATA[
+      include ':counter_api'
+      include ':counter_impl'
+      include ':counter_android_service'
+      include ':counter_android_client'
+      include ':counter_android_messenger'
+    ]]>
+		</insert>
+
+	</settingsGradleAdditions>
+
+	<buildGradleAdditions>
+		<insert>
+            <![CDATA[
+                dependencies {
+                implementation project(':counter_api')
+                implementation project(':counter_impl')
+                implementation project(':counter_android_service')
+                implementation project(':counter_android_client')
+                implementation project(':counter_android_messenger')
+                }
+            ]]>
+        </insert>
+		<insert>
+			<![CDATA[
+tasks.configureEach { task ->
+	if (task.name == 'assembleDebug') {
+		task.dependsOn ':counter_api:assembleDebug'
+		task.dependsOn ':counter_impl:assembleDebug'
+		task.dependsOn ':counter_android_service:assembleDebug'
+		task.dependsOn ':counter_android_client:assembleDebug'
+		task.dependsOn ':counter_android_messenger:assembleDebug'
+	}
+	if (task.name == 'assembleRelease') {
+		task.dependsOn ':counter_api:assembleRelease'
+		task.dependsOn ':counter_impl:assembleRelease'
+		task.dependsOn ':counter_android_service:assembleRelease'
+		task.dependsOn ':counter_android_client:assembleRelease'
+		task.dependsOn ':counter_android_messenger:assembleRelease'
+	}
+}
+
+]]>
+		</insert>
+	</buildGradleAdditions>
+
+
+	<proguardAdditions>
+		<insert>
+			-keep class counter.counterjniservice.CounterJniService {
+			public *;
+			}
+			-keep class counter.counterjniservice.CounterJniServiceStarter {
+			public *;
+			}
+			-keep class counter.counterjniclient.CounterJniClient {
+			public *;
+			}
+		</insert>
+	</proguardAdditions>
+
+
+
+	<!-- optional additions to the GameActivity class in GameActivity.java -->
+	<gameActivityClassAdditions>
+	</gameActivityClassAdditions>
+
+
+	<!-- optional additions to GameActivity onCreate in GameActivity.java -->
+	<gameActivityOnCreateAdditions>
+		<insert>
+			<![CDATA[
+		]]>
+		</insert>
+	</gameActivityOnCreateAdditions>
+
+
+</root>

goldenmaster/Plugins/Counter/Source/CounterJni/Private/Generated/CounterJni.cpp

@@ -0,0 +1,42 @@
+/**
+Copyright 2021 ApiGear UG
+Copyright 2021 Epic Games, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+#include "Counter/CounterJni.h"
+#include "Counter/Generated/CounterFactory.h"
+#include "Counter/Generated/Jni/CounterDataJavaConverter.h"
+#include "Engine/Engine.h"
+#include "CounterSettings.h"
+#include "Modules/ModuleManager.h"
+
+#define LOCTEXT_NAMESPACE "CounterJni"
+
+void FCounterJniModule::StartupModule()
+{
+}
+
+void FCounterJniModule::ShutdownModule()
+{
+// This function may be called during shutdown to clean up your module.  For modules that support dynamic reloading,
+// we call this function before unloading the module.
+#if PLATFORM_ANDROID && USE_ANDROID_JNI
+	CounterDataJavaConverter::cleanJavaReferences();
+#endif
+}
+
+IMPLEMENT_MODULE(FCounterJniModule, CounterJni)
+
+#undef LOCTEXT_NAMESPACE