Skip to content

Commit

Permalink
firebase-components
Browse files Browse the repository at this point in the history
  • Loading branch information
tuarua committed Aug 22, 2020
1 parent 1dbbf3e commit 1f6c4e2
Show file tree
Hide file tree
Showing 57 changed files with 92 additions and 90 deletions.
2 changes: 2 additions & 0 deletions example/get_android_dependencies.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ $SupportV4Version = "1.0.0"
$AnalyticsVersion = "17.5.0"
$DynamicLinksVersion = "19.1.0"
$IidVersion="20.2.4"
$FirebaseComponentsVersion="16.0.0"
$StorageVersion="19.1.1"
$PerfVersion = "19.0.8"
$FirestoreVersion = "21.5.0"
Expand Down Expand Up @@ -46,6 +47,7 @@ Invoke-WebRequest -OutFile "$currentDir\android_dependencies\androidx.browser.br
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.android.gms.play-services-base-$PlayerServicesBaseVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/play-services/com.google.android.gms.play-services-base-$PlayerServicesBaseVersion.ane?raw=true
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.android.gms.play-services-auth-$PlayerServicesAuthVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/play-services/com.google.android.gms.play-services-auth-$PlayerServicesAuthVersion.ane?raw=true
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.android.gms.play-services-measurement-$PlayerServicesMeasurementVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/play-services/com.google.android.gms.play-services-measurement-$PlayerServicesMeasurementVersion.ane?raw=true
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.firebase.firebase-components-$FirebaseComponentsVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-components-$FirebaseComponentsVersion.ane?raw=true
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.firebase.firebase-analytics-ktx-$AnalyticsVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-analytics-ktx-$AnalyticsVersion.ane?raw=true
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.firebase.firebase-auth-ktx-$AuthVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-auth-ktx-$AuthVersion.ane?raw=true
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.firebase.firebase-config-ktx-$ConfigVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-config-ktx-$ConfigVersion.ane?raw=true
Expand Down
2 changes: 2 additions & 0 deletions example/get_android_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ PlayerServicesMeasurementVersion="17.5.0"
SupportV4Version="1.0.0"
AnalyticsVersion="17.5.0"
DynamicLinksVersion="19.1.0"
FirebaseComponentsVersion="16.0.0"
IidVersion="20.2.3"
StorageVersion="19.1.1"
PerfVersion="19.0.8"
Expand Down Expand Up @@ -47,6 +48,7 @@ wget -O android_dependencies/com.google.android.gms.play-services-base-$PlayerSe
wget -O android_dependencies/com.google.android.gms.play-services-auth-$PlayerServicesAuthVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/play-services/com.google.android.gms.play-services-auth-$PlayerServicesAuthVersion.ane?raw=true
wget -O android_dependencies/com.google.android.gms.play-services-measurement-$PlayerServicesMeasurementVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/play-services/com.google.android.gms.play-services-measurement-$PlayerServicesMeasurementVersion.ane?raw=true

wget -O android_dependencies/com.google.firebase.firebase-components-$FirebaseComponentsVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-components-$FirebaseComponentsVersion.ane?raw=true
wget -O android_dependencies/com.google.firebase.firebase-crashlytics-$CrashlyticsVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-crashlytics-$CrashlyticsVersion.ane?raw=true
wget -O android_dependencies/com.google.firebase.firebase-analytics-ktx-$AnalyticsVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-analytics-ktx-$AnalyticsVersion.ane?raw=true
wget -O android_dependencies/com.google.firebase.firebase-auth-ktx-$AuthVersion.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-auth-ktx-$AuthVersion.ane?raw=true
Expand Down
1 change: 1 addition & 0 deletions example/src/Main-app-android.xml
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@
<extensionID>com.tuarua.firebase.PerformanceANE</extensionID>
<extensionID>com.tuarua.firebase.CrashlyticsANE</extensionID>

<extensionID>com.google.firebase.firebase-components</extensionID>
<extensionID>com.google.firebase.firebase-analytics-ktx</extensionID>
<extensionID>com.google.firebase.firebase-iid</extensionID>
<extensionID>com.google.firebase.firebase-firestore-ktx</extensionID>
Expand Down
4 changes: 1 addition & 3 deletions example_vision/VisionANESample.iml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="Flex" version="4">
<component name="FlexBuildConfigurationManager" active="iOS Device">
<component name="FlexBuildConfigurationManager" active="Android Device">
<configurations>
<configuration name="iOS Device" target-platform="Mobile" pure-as="true" main-class="Main" output-file="Main.swf" output-folder="$MODULE_DIR$/bin-release">
<dependencies target-player="30.0">
Expand Down Expand Up @@ -56,9 +56,7 @@
<FilePathAndPathInPackage file-path="$MODULE_DIR$/system/AppIcon76x76@2x~ipad.png" path-in-package="AppIcon76x76@2x~ipad.png" />
<FilePathAndPathInPackage file-path="$MODULE_DIR$/system/AppIcon76x76~ipad.png" path-in-package="AppIcon76x76~ipad.png" />
<FilePathAndPathInPackage file-path="$MODULE_DIR$/system/AppIcon83.5x83.5@2x~ipad.png" path-in-package="AppIcon83.5x83.5@2x~ipad.png" />
<FilePathAndPathInPackage file-path="$MODULE_DIR$/assets/models" path-in-package="models" />
<FilePathAndPathInPackage file-path="$MODULE_DIR$/assets/mobilenet" path-in-package="mobilenet" />
<FilePathAndPathInPackage file-path="$MODULE_DIR$/assets/langid_model.smfb.jpg" path-in-package="langid_model.smfb.jpg" />
</files-to-package>
<AirSigningOptions arch="armv8" />
</packaging-android>
Expand Down
2 changes: 2 additions & 0 deletions example_vision/get_android_dependencies.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ $PlayerServicesBaseVersion = "17.1.0"
$SupportV4Version = "1.0.0"
$AnalyticsVersion = "17.5.0"
$IidVersion = "20.2.3"
$FirebaseComponentsVersion="16.0.0"
$VisionVersion = "24.0.3"
$ModelInterpreterVersion = "22.0.3"
$KotlinxCoroutinesVersion = "1.3.9"
Expand Down Expand Up @@ -31,6 +32,7 @@ Invoke-WebRequest -OutFile "$currentDir\android_dependencies\org.greenrobot.even
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.code.gson.gson-$GsonVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/misc/com.google.code.gson.gson-$GsonVersion.ane?raw=true
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\androidx.legacy.legacy-support-v4-$SupportV4Version.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/support/androidx.legacy.legacy-support-v4-$SupportV4Version.ane?raw=true
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.android.gms.play-services-base-$PlayerServicesBaseVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/play-services/com.google.android.gms.play-services-base-$PlayerServicesBaseVersion.ane?raw=true
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.firebase.firebase-components-$FirebaseComponentsVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-components-$FirebaseComponentsVersion.ane?raw=true
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.firebase.firebase-analytics-$AnalyticsVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-analytics-$AnalyticsVersion.ane?raw=true
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.firebase.firebase-iid-$IidVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-iid-$IidVersion.ane?raw=true
Invoke-WebRequest -OutFile "$currentDir\android_dependencies\com.google.firebase.firebase-ml-vision-$VisionVersion.ane" -Uri https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-ml-vision-$VisionVersion.ane?raw=true
Expand Down
2 changes: 2 additions & 0 deletions example_vision/get_android_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ PlayerServicesBaseVersion="17.1.0"
SupportV4Version="1.0.0"
AnalyticsVersion="17.5.0"
IidVersion="20.2.3"
FirebaseComponentsVersion="16.0.0"
VisionVersion="24.0.3"
ModelInterpreterVersion="22.0.3"
KotlinxCoroutinesVersion="1.3.9"
Expand All @@ -32,6 +33,7 @@ wget -O android_dependencies/org.greenrobot.eventbus-${EventBusVersion}.ane http
wget -O android_dependencies/com.google.code.gson.gson-${GsonVersion}.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/misc/com.google.code.gson.gson-${GsonVersion}.ane?raw=true
wget -O android_dependencies/androidx.legacy.legacy-support-v4-${SupportV4Version}.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/support/androidx.legacy.legacy-support-v4-$SupportV4Version.ane?raw=true
wget -O android_dependencies/com.google.android.gms.play-services-base-${PlayerServicesBaseVersion}.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/play-services/com.google.android.gms.play-services-base-$PlayerServicesBaseVersion.ane?raw=true
wget -O android_dependencies/com.google.firebase.firebase-components-${FirebaseComponentsVersion}.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-components-${FirebaseComponentsVersion}.ane?raw=true
wget -O android_dependencies/com.google.firebase.firebase-analytics-${AnalyticsVersion}.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-analytics-${AnalyticsVersion}.ane?raw=true
wget -O android_dependencies/com.google.firebase.firebase-iid-${IidVersion}.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-iid-${IidVersion}.ane?raw=true
wget -O android_dependencies/com.google.firebase.firebase-ml-vision-${VisionVersion}.ane https://github.com/tuarua/Android-ANE-Dependencies/blob/master/anes/firebase/com.google.firebase.firebase-ml-vision-${VisionVersion}.ane?raw=true
Expand Down
1 change: 1 addition & 0 deletions example_vision/src/Main-app-android.xml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
<extensionID>com.tuarua.firebase.VisionLandmarkANE</extensionID>
<extensionID>com.tuarua.firebase.ModelInterpreterANE</extensionID>

<extensionID>com.google.firebase.firebase-components</extensionID>
<extensionID>com.google.firebase.firebase-analytics-ktx</extensionID>
<extensionID>com.google.firebase.firebase-iid</extensionID>
<extensionID>com.google.firebase.firebase-ml-vision</extensionID>
Expand Down
Binary file modified native_extension/AnalyticsANE/bin/AnalyticsANE.swc
Binary file not shown.
Binary file modified native_extension/AuthANE/bin/AuthANE.swc
Binary file not shown.
Binary file modified native_extension/CrashlyticsANE/bin/CrashlyticsANE.swc
Binary file not shown.
Binary file modified native_extension/DynamicLinksANE/bin/DynamicLinksANE.swc
Binary file not shown.
Binary file modified native_extension/FirestoreANE/bin/FirestoreANE.swc
Binary file not shown.
Binary file modified native_extension/GoogleSignInANE/bin/GoogleSignInANE.swc
Binary file not shown.
6 changes: 3 additions & 3 deletions native_extension/LanguageIdentificationANE/ane/build_multi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ cp "$pathtome/library.swf" "$pathtome/platforms/android"
#Copy native libraries into place.
echo "Copying native libraries into place."
cp -R -L "$pathtome/../../../native_library/apple/FirebaseANE/Build/Products/Release-iphoneos/lib$PROJECTNAME$libSuffix.a" "$pathtome/platforms/ios/device/lib$PROJECTNAME.a"
cp -R -L "$pathtome/../../../firebase_frameworks/device/FirebaseMLNLLanguageID.framework" "$pathtome/platforms/ios/device/Frameworks"
cp -R -L "$pathtome/../../../firebase_frameworks/device/FirebaseMLNaturalLanguage.framework" "$pathtome/platforms/ios/device/Frameworks"
#cp -R -L "$pathtome/../../../firebase_frameworks/device/FirebaseMLNLLanguageID.framework" "$pathtome/platforms/ios/device/Frameworks"
#cp -R -L "$pathtome/../../../firebase_frameworks/device/FirebaseMLNaturalLanguage.framework" "$pathtome/platforms/ios/device/Frameworks"

echo "Copying Android aars into place"
cp "$pathtome/../../../native_library/android/FirebaseANE/LanguageIdentification/build/outputs/aar/LanguageIdentification-release.aar" "$pathtome/platforms/android/app-release.aar"
Expand Down Expand Up @@ -84,7 +84,7 @@ com.tuarua.mlkit.nl.${PROJECTNAME}-res/. \
com.tuarua.mlkit.nl.${PROJECTNAME}-res/. \
-platformoptions "$pathtome/platforms/android/platform.xml" \

#cp "$pathtome/$PROJECTNAME.ane" "$pathtome/../../../example_vision/extensions/$PROJECTNAME.ane"
cp "$pathtome/$PROJECTNAME.ane" "$pathtome/../../../example_mlkit/extensions/$PROJECTNAME.ane"

echo "Packaging docs into ANE."
zip "$pathtome/$PROJECTNAME.ane" -u docs/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<option>-rpath /usr/lib/swift</option>
</linkerOptions>

<packagedDependencies>
<packagedDependency>Frameworks/FirebaseMLNLLanguageID.framework</packagedDependency>
<packagedDependency>Frameworks/FirebaseMLNaturalLanguage.framework</packagedDependency>
</packagedDependencies>
<!-- <packagedDependencies>-->
<!-- <packagedDependency>Frameworks/FirebaseMLNLLanguageID.framework</packagedDependency>-->
<!-- <packagedDependency>Frameworks/FirebaseMLNaturalLanguage.framework</packagedDependency>-->
<!-- </packagedDependencies>-->

</platform>
Binary file not shown.
4 changes: 4 additions & 0 deletions native_extension/MLKitANE/ane/build_multi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ echo "Building ANE."
-platform iPhone-ARM -C "$pathtome/platforms/ios/device" "library.swf" "Frameworks" "lib$PROJECTNAME.a" \
-platformoptions "$pathtome/platforms/ios/platform.xml" \
-platform default -C "$pathtome/platforms/default" "library.swf" \
-C "$pathtome/platforms/android" "AndroidManifest.xml" \
-C "$pathtome/platforms/ios" "Entitlements.entitlements" "InfoAdditions.plist" \
-platform Android-x86 \
-C "$pathtome/platforms/android" "library.swf" "classes.jar" \
com.tuarua.mlkit.${PROJECTNAME}-res/. \
Expand All @@ -84,6 +86,8 @@ com.tuarua.mlkit.${PROJECTNAME}-res/. \
echo "Packaging docs into ANE."
zip "$pathtome/$PROJECTNAME.ane" -u docs/*

cp "$pathtome/$PROJECTNAME.ane" "$pathtome/../../../example_mlkit/extensions/$PROJECTNAME.ane"

#remove the frameworks from sim and device, as not needed any more
rm "$pathtome/platforms/android/classes.jar"
rm "$pathtome/platforms/android/app-release.aar"
Expand Down
Binary file modified native_extension/MLKitANE/bin/MLKitANE.swc
Binary file not shown.
Binary file modified native_extension/MessagingANE/bin/MessagingANE.swc
Binary file not shown.
Binary file modified native_extension/ModelInterpreterANE/bin/ModelInterpreterANE.swc
Binary file not shown.
Binary file modified native_extension/OneSignalANE/bin/OneSignalANE.swc
Binary file not shown.
Binary file modified native_extension/PerformanceANE/bin/PerformanceANE.swc
Binary file not shown.
Binary file modified native_extension/RemoteConfigANE/bin/RemoteConfigANE.swc
Binary file not shown.
Binary file modified native_extension/StorageANE/bin/StorageANE.swc
Binary file not shown.
Binary file modified native_extension/VisionANE/bin/VisionANE.swc
Binary file not shown.
4 changes: 4 additions & 0 deletions native_extension/VisionBarcodeANE/ane/build_multi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ echo "Building ANE."
-platform iPhone-ARM -C "$pathtome/platforms/ios/device" "library.swf" "Frameworks" "lib$PROJECTNAME.a" \
-platformoptions "$pathtome/platforms/ios/platform.xml" \
-platform default -C "$pathtome/platforms/default" "library.swf" \
-C "$pathtome/platforms/android" "AndroidManifest.xml" \
-C "$pathtome/platforms/ios" "Entitlements.entitlements" "InfoAdditions.plist" \
-platform Android-x86 \
-C "$pathtome/platforms/android" "library.swf" "classes.jar" \
com.tuarua.mlkit.vision.${PROJECTNAME}-res/. \
Expand All @@ -82,6 +84,8 @@ com.tuarua.mlkit.vision.${PROJECTNAME}-res/. \
com.tuarua.mlkit.vision.${PROJECTNAME}-res/. \
-platformoptions "$pathtome/platforms/android/platform.xml" \

cp "$pathtome/$PROJECTNAME.ane" "$pathtome/../../../example_mlkit/extensions/$PROJECTNAME.ane"

#remove the frameworks from sim and device, as not needed any more
rm "$pathtome/platforms/android/classes.jar"
rm "$pathtome/platforms/android/app-release.aar"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<option>-rpath /usr/lib/swift</option>
</linkerOptions>

<packagedDependencies>
<packagedDependency>Frameworks/FirebaseMLVisionBarcodeModel.framework</packagedDependency>
<packagedDependency>Frameworks/BarcodeDetector.framework</packagedDependency>
</packagedDependencies>
<!-- <packagedDependencies>-->
<!-- <packagedDependency>Frameworks/FirebaseMLVisionBarcodeModel.framework</packagedDependency>-->
<!-- <packagedDependency>Frameworks/BarcodeDetector.framework</packagedDependency>-->
<!-- </packagedDependencies>-->

</platform>
Binary file modified native_extension/VisionBarcodeANE/bin/BarcodeANE.swc
Binary file not shown.
Binary file not shown.
Binary file modified native_extension/VisionCloudLabelANE/bin/VisionCloudLabelANE.swc
Binary file not shown.
Binary file modified native_extension/VisionCloudTextANE/bin/VisionCloudTextANE.swc
Binary file not shown.
8 changes: 6 additions & 2 deletions native_extension/VisionFaceANE/ane/build_multi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ cp "$pathtome/library.swf" "$pathtome/platforms/android"
#Copy native libraries into place.
echo "Copying native libraries into place."
cp -R -L "$pathtome/../../../native_library/apple/FirebaseANE/Build/Products/Release-iphoneos/lib$PROJECTNAME$libSuffix.a" "$pathtome/platforms/ios/device/lib$PROJECTNAME.a"
cp -R -L "$pathtome/../../../firebase_frameworks/device/FirebaseMLVisionFaceModel.framework" "$pathtome/platforms/ios/device/Frameworks"
cp -R -L "$pathtome/../../../firebase_frameworks/device/FaceDetector.framework" "$pathtome/platforms/ios/device/Frameworks"
#cp -R -L "$pathtome/../../../firebase_frameworks/device/FirebaseMLVisionFaceModel.framework" "$pathtome/platforms/ios/device/Frameworks"
#cp -R -L "$pathtome/../../../firebase_frameworks/device/FaceDetector.framework" "$pathtome/platforms/ios/device/Frameworks"

echo "Copying Android aars into place"
cp "$pathtome/../../../native_library/android/FirebaseANE/VisionFace/build/outputs/aar/VisionFace-release.aar" "$pathtome/platforms/android/app-release.aar"
Expand All @@ -69,6 +69,8 @@ echo "Building ANE."
-platform iPhone-ARM -C "$pathtome/platforms/ios/device" "library.swf" "Frameworks" "lib$PROJECTNAME.a" \
-platformoptions "$pathtome/platforms/ios/platform.xml" \
-platform default -C "$pathtome/platforms/default" "library.swf" \
-C "$pathtome/platforms/android" "AndroidManifest.xml" \
-C "$pathtome/platforms/ios" "Entitlements.entitlements" "InfoAdditions.plist" \
-platform Android-x86 \
-C "$pathtome/platforms/android" "library.swf" "classes.jar" \
com.tuarua.mlkit.vision.${PROJECTNAME}-res/. \
Expand All @@ -82,6 +84,8 @@ com.tuarua.mlkit.vision.${PROJECTNAME}-res/. \
com.tuarua.mlkit.vision.${PROJECTNAME}-res/. \
-platformoptions "$pathtome/platforms/android/platform.xml" \

cp "$pathtome/$PROJECTNAME.ane" "$pathtome/../../../example_mlkit/extensions/$PROJECTNAME.ane"

#remove the frameworks from sim and device, as not needed any more
rm "$pathtome/platforms/android/classes.jar"
rm "$pathtome/platforms/android/app-release.aar"
Expand Down
8 changes: 4 additions & 4 deletions native_extension/VisionFaceANE/ane/platforms/ios/platform.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<option>-rpath /usr/lib/swift</option>
</linkerOptions>

<packagedDependencies>
<packagedDependency>Frameworks/FirebaseMLVisionFaceModel.framework</packagedDependency>
<packagedDependency>Frameworks/FaceDetector.framework</packagedDependency>
</packagedDependencies>
<!-- <packagedDependencies>-->
<!-- <packagedDependency>Frameworks/FirebaseMLVisionFaceModel.framework</packagedDependency>-->
<!-- <packagedDependency>Frameworks/FaceDetector.framework</packagedDependency>-->
<!-- </packagedDependencies>-->

</platform>
Binary file modified native_extension/VisionFaceANE/bin/FaceANE.swc
Binary file not shown.
8 changes: 6 additions & 2 deletions native_extension/VisionLabelANE/ane/build_multi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ cp "$pathtome/library.swf" "$pathtome/platforms/android"
echo "Copying native libraries into place."

cp -R -L "$pathtome/../../../native_library/apple/FirebaseANE/Build/Products/Release-iphoneos/lib$PROJECTNAME$libSuffix.a" "$pathtome/platforms/ios/device/lib$PROJECTNAME.a"
cp -R -L "$pathtome/../../../firebase_frameworks/device/FirebaseMLVisionLabelModel.framework" "$pathtome/platforms/ios/device/Frameworks"
cp -R -L "$pathtome/../../../firebase_frameworks/device/LabelDetector.framework" "$pathtome/platforms/ios/device/Frameworks"
#cp -R -L "$pathtome/../../../firebase_frameworks/device/FirebaseMLVisionLabelModel.framework" "$pathtome/platforms/ios/device/Frameworks"
#cp -R -L "$pathtome/../../../firebase_frameworks/device/LabelDetector.framework" "$pathtome/platforms/ios/device/Frameworks"

echo "Copying Android aars into place"
cp "$pathtome/../../../native_library/android/FirebaseANE/VisionLabel/build/outputs/aar/VisionLabel-release.aar" "$pathtome/platforms/android/app-release.aar"
Expand All @@ -69,6 +69,8 @@ echo "Building ANE."
-platform iPhone-ARM -C "$pathtome/platforms/ios/device" "library.swf" "Frameworks" "lib$PROJECTNAME.a" \
-platformoptions "$pathtome/platforms/ios/platform.xml" \
-platform default -C "$pathtome/platforms/default" "library.swf" \
-C "$pathtome/platforms/android" "AndroidManifest.xml" \
-C "$pathtome/platforms/ios" "Entitlements.entitlements" "InfoAdditions.plist" \
-platform Android-x86 \
-C "$pathtome/platforms/android" "library.swf" "classes.jar" \
com.tuarua.mlkit.vision.${PROJECTNAME}-res/. \
Expand All @@ -82,6 +84,8 @@ com.tuarua.mlkit.vision.${PROJECTNAME}-res/. \
com.tuarua.mlkit.vision.${PROJECTNAME}-res/. \
-platformoptions "$pathtome/platforms/android/platform.xml" \

cp "$pathtome/$PROJECTNAME.ane" "$pathtome/../../../example_mlkit/extensions/$PROJECTNAME.ane"

#remove the frameworks from sim and device, as not needed any more
rm "$pathtome/platforms/android/classes.jar"
rm "$pathtome/platforms/android/app-release.aar"
Expand Down
Loading

0 comments on commit 1f6c4e2

Please sign in to comment.