added the x86_64 binaries, see tjwoon#140

nrcrabbe · Jan 23, 2020 · 3c606b9 · 3c606b9
1 parent 64e00fd
commit 3c606b9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/android/libs/x86_64/libiconv.so b/android/libs/x86_64/libiconv.so
diff --git a/android/libs/x86_64/libzbarjni.so b/android/libs/x86_64/libzbarjni.so
diff --git a/plugin.xml b/plugin.xml
@@ -23,7 +23,7 @@
                 <param name="android-package" value="org.cloudsky.cordovaPlugins.ZBar"/>
             </feature>
         </config-file>
-        <config-file target="AndroidManifest.xml" parent="application">
+        <config-file target="AndroidManifest.xml" parent="/manifest/application">
         <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"
                 android:name="org.cloudsky.cordovaPlugins.ZBarScannerActivity"
                 android:screenOrientation="portrait"
@@ -57,9 +57,11 @@
         <resource-file src="android/libs/armeabi-v7a/libiconv.so" target="libs/armeabi-v7a/libiconv.so" />
         <resource-file src="android/libs/armeabi-v7a/libzbarjni.so" target="libs/armeabi-v7a/libzbarjni.so" />
         <resource-file src="android/libs/arm64-v8a/libiconv.so" target="libs/arm64-v8a/libiconv.so" />
-        <resource-file src="android/libs/arm64-v8a/libzbarjni.so" target="libs/arm64-v8a/libzbarjni.so" />s
+        <resource-file src="android/libs/arm64-v8a/libzbarjni.so" target="libs/arm64-v8a/libzbarjni.so" />
         <resource-file src="android/libs/x86/libiconv.so" target="libs/x86/libiconv.so" />
         <resource-file src="android/libs/x86/libzbarjni.so" target="libs/x86/libzbarjni.so" />
+        <resource-file src="android/libs/x86_64/libiconv.so" target="libs/x86_64/libiconv.so" />
+        <resource-file src="android/libs/x86_64/libzbarjni.so" target="libs/x86_64/libzbarjni.so" />
 
         <!-- cordova-android 7 directives (hopefully ignored by cordova-android 6) -->
         <resource-file src="android/libs/zbar.jar" target="jniLibs/zbar.jar" />
@@ -68,7 +70,7 @@
         <resource-file src="android/libs/armeabi-v7a/libiconv.so" target="jniLibs/armeabi-v7a/libiconv.so" />
         <resource-file src="android/libs/armeabi-v7a/libzbarjni.so" target="jniLibs/armeabi-v7a/libzbarjni.so" />
         <resource-file src="android/libs/arm64-v8a/libiconv.so" target="jniLibs/arm64-v8a/libiconv.so" />
-        <resource-file src="android/libs/arm64-v8a/libzbarjni.so" target="jniLibs/arm64-v8a/libzbarjni.so" />s
+        <resource-file src="android/libs/arm64-v8a/libzbarjni.so" target="jniLibs/arm64-v8a/libzbarjni.so" />
         <resource-file src="android/libs/x86/libiconv.so" target="jniLibs/x86/libiconv.so" />
         <resource-file src="android/libs/x86/libzbarjni.so" target="jniLibs/x86/libzbarjni.so" />