fix: Android package

Signed-off-by: The one with the braid <info@braid.business>

2 files changed, 14 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00531ff657ac..99bac031882c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -141,7 +141,7 @@ pkgbase = flutter
 
 pkgname = flutter
 	pkgdesc = Flutter SDK component - full installation of development tool and runtime
-	depends = flutter-tool-developer
+	depends = flutter-devel
 	depends = flutter-target-linux
 	depends = flutter-target-android
 	depends = flutter-target-web
@@ -151,7 +151,7 @@ pkgname = flutter-tool
 	pkgdesc = Flutter SDK component - CLI tool (for packaging only)
 	depends = flutter-common
 
-pkgname = flutter-tool-developer
+pkgname = flutter-devel
 	pkgdesc = Flutter SDK component - CLI tool (for application development)
 	depends = flutter-tool
 
@@ -169,6 +169,10 @@ pkgname = flutter-common
 	depends = glu
 
 pkgname = flutter-target-android
+	pkgdesc = Flutter SDK component - android target files
+	depends = flutter-tool
+	optdepends = android-sdk: develop for Android devices
+	optdepends = java-environment: develop for Android devices
 
 pkgname = flutter-target-web
 	pkgdesc = Flutter SDK component - web target files
diff --git a/PKGBUILD b/PKGBUILD
index 8104f9677d7d..1fd0d1a271b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -324,7 +324,7 @@ build() {
 
 _package() {
   pkgdesc="${_pkgdesc} - full installation of development tool and runtime"
-  depends=("${pkgbase}-tool-developer" "${pkgbase}-target-linux" "${pkgbase}-target-android" "${pkgbase}-target-web" "${pkgbase}-intellij-patch")
+  depends=("${pkgbase}-devel" "${pkgbase}-target-linux" "${pkgbase}-target-android" "${pkgbase}-target-web" "${pkgbase}-intellij-patch")
 }
 
 _package-common() {
@@ -398,7 +398,7 @@ _package-target-web() {
   cp -ra "${srcdir}/${pkgbase}/packages/flutter_tools/lib/src/web/file_generators" "${pkgdir}/usr/lib/${pkgbase}/packages/flutter_tools/lib/src/web"
 }
 
-_package-tagret-android() {
+_package-target-android() {
   pkgdesc="${_pkgdesc} - android target files"
   depends=("${pkgbase}-tool")
   optdepends=("android-sdk: develop for Android devices"
@@ -408,6 +408,7 @@ _package-tagret-android() {
 
   install -dm755 "${pkgdir}/usr/lib/${pkgbase}/bin/cache/artifacts/engine"
   install -dm755 "${pkgdir}/usr/lib/${pkgbase}/packages/flutter_tools"
+  install -dm755 "${pkgdir}/usr/lib/${pkgbase}/bin/internal"
 
   cp -ra "${srcdir}/${pkgbase}/bin/cache/artifacts/engine/android-arm" "${pkgdir}/usr/lib/${pkgbase}/bin/cache/artifacts/engine"
   cp -ra "${srcdir}/${pkgbase}/bin/cache/artifacts/engine/android-arm-release" "${pkgdir}/usr/lib/${pkgbase}/bin/cache/artifacts/engine"
@@ -426,6 +427,9 @@ _package-tagret-android() {
 
   cp -ra "${srcdir}/${pkgbase}/bin/cache/artifacts/gradle_wrapper" "${pkgdir}/usr/lib/${pkgbase}/bin/cache/artifacts"
   cp -ra "${srcdir}/${pkgbase}/packages/flutter_tools/gradle" "${pkgdir}/usr/lib/${pkgbase}/packages/flutter_tools"
+
+  install -Dm644 "${srcdir}/${pkgbase}/bin/internal/engine.version" "${pkgdir}/usr/lib/${pkgbase}/bin/internal/engine.version"
+  install -Dm644 "${srcdir}/${pkgbase}/bin/internal/engine.realm" "${pkgdir}/usr/lib/${pkgbase}/bin/internal/engine.realm"
 }
 
 _package-tool() {
@@ -448,7 +452,7 @@ _package-tool() {
   ln -sf "/usr/lib/flutter/bin/flutter" "${pkgdir}/usr/bin/flutter"
 }
 
-_package-tool-developer() {
+_package-devel() {
   pkgdesc="${_pkgdesc} - CLI tool (for application development)"
   depends=("${pkgbase}-tool")
 
@@ -460,7 +464,6 @@ _package-tool-developer() {
   cp -ra "${srcdir}/${pkgbase}/packages/flutter_tools/templates" "${pkgdir}/usr/lib/${pkgbase}/packages/flutter_tools"
 }
 
-
 _package-intellij-patch() {
   pkgdesc="${_pkgdesc} - IntelliJ Flutter plugin hotfix"
   depends=("${pkgbase}-common")
@@ -470,8 +473,6 @@ _package-intellij-patch() {
         "intellij-idea-ultimate-edition"
   )
 
-
-
   install -dm755 "${pkgdir}/usr/lib/${pkgbase}/bin/cache"
   
   ln -sf "${DART_ROOT:-"/opt/dart-sdk"}/bin/dart" "${pkgdir}/usr/lib/${pkgbase}/bin/dart"
@@ -479,7 +480,7 @@ _package-intellij-patch() {
   ln -sf "${DART_ROOT:-"/opt/dart-sdk"}" "${pkgdir}/usr/lib/${pkgbase}/bin/cache/dart-sdk"
 }
 
-pkgname=("${pkgbase}" "${pkgbase}-tool" "${pkgbase}-tool-developer" "${pkgbase}-target-linux" "${pkgbase}-common" "${pkgbase}-target-android" "${pkgbase}-target-web" "${pkgbase}-intellij-patch")
+pkgname=("${pkgbase}" "${pkgbase}-tool" "${pkgbase}-devel" "${pkgbase}-target-linux" "${pkgbase}-common" "${pkgbase}-target-android" "${pkgbase}-target-web" "${pkgbase}-intellij-patch")
 
 for _p in "${pkgname[@]}"; do
   eval "package_$_p() {