Skip to content

Commit

Permalink
Minimal running integration using modern toolchain.
Browse files Browse the repository at this point in the history
  • Loading branch information
robsondepaula committed Aug 24, 2020
1 parent 40d54e4 commit 4d346ca
Show file tree
Hide file tree
Showing 8 changed files with 70 additions and 4 deletions.
1 change: 0 additions & 1 deletion UnityAndroidCamera/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
/[Pp]ackages/
/Assets/AssetStoreTools*
/Logs/
/UserSettings/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="arp.camera"
android:versionCode="1"
android:versionName="1.0" >

<uses-sdk
android:minSdkVersion="28"
android:targetSdkVersion="28" />

<uses-permission android:name="android.permission.CAMERA" />

<uses-feature
android:glEsVersion="0x00020000"
android:required="true" />
<uses-feature
android:name="android.hardware.camera2"
android:required="true" />
<uses-feature
android:name="android.hardware.camera"
android:required="true" />
<uses-feature
android:name="android.hardware.camera.autofocus"
android:required="true" />

<application android:label="@string/app_name" >
<activity
android:name="arp.camera.CameraPluginActivity"
android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
android:label="@string/app_name"
android:screenOrientation="landscape" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified UnityAndroidCamera/Assets/Plugins/Android/camera-release.aar
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions UnityAndroidCamera/UserSettings/EditorUserSettings.asset

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion UnityAndroidCameraPlugin/camera/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ gradle.startParameter.taskRequests.each { taskRequest ->
}

ext.unityPluginPath = "../../UnityAndroidCamera/Assets/Plugins/Android/"
ext.unityManifestPath = "../../UnityAndroidCamera/Assets/Plugins/Android/LauncherManifest.xml"
ext.unityPluginArtifact = "camera-release.aar"
ext.artifactPath = "build/outputs/aar/"
ext.manifestPath = "build/intermediates/manifests/full/"
ext.manifestPath = "build/intermediates/library_manifest/"
ext.artifactName = "camera"

// convenience method to deploy release Android archive and manifest to the Unity application project
Expand Down

0 comments on commit 4d346ca

Please sign in to comment.