Do not exclude "opt" dir on Android, exclude .hpp from packaging

FeodorFitsner · FeodorFitsner · commit 521aa20368bf · 2024-12-02T15:48:45.000-08:00
diff --git a/src/serious_python/bin/package_command.dart b/src/serious_python/bin/package_command.dart
@@ -54,7 +54,7 @@ const platforms = {
   }
 };
 
-const junkFileExtensionsDesktop = [".c", ".h", ".typed", ".a", ".pdb"];
+const junkFileExtensionsDesktop = [".c", ".h", ".hpp", ".typed", ".a", ".pdb"];
 const junkFileExtensionsMobile = [...junkFileExtensionsDesktop, ".exe", ".dll"];
 
 const junkFilesDesktop = ["__pycache__"];
diff --git a/src/serious_python_android/android/build.gradle b/src/serious_python_android/android/build.gradle
@@ -116,7 +116,7 @@ android.defaultConfig.ndk.abiFilters.each { abi ->
     }
 
     tasks.register("zipSitePackages_$abi", Zip) {
-        from fileTree(dir: "$srcDir/$abi", exclude: ["opt"])
+        from fileTree(dir: "$srcDir/$abi")
         archiveFileName = "libpythonsitepackages.so"
         destinationDirectory = file("src/main/jniLibs/$abi")
         dependsOn "jniCleanUp_$abi", "untarFile_$abi"

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ const platforms = {`
`54`	`54`	`}`
`55`	`55`	`};`
`56`	`56`
`57`		`-const junkFileExtensionsDesktop = [".c", ".h", ".typed", ".a", ".pdb"];`
	`57`	`+const junkFileExtensionsDesktop = [".c", ".h", ".hpp", ".typed", ".a", ".pdb"];`
`58`	`58`	`const junkFileExtensionsMobile = [...junkFileExtensionsDesktop, ".exe", ".dll"];`
`59`	`59`
`60`	`60`	`const junkFilesDesktop = ["__pycache__"];`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ android.defaultConfig.ndk.abiFilters.each { abi ->`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`tasks.register("zipSitePackages_$abi", Zip) {`
`119`		`- from fileTree(dir: "$srcDir/$abi", exclude: ["opt"])`
	`119`	`+ from fileTree(dir: "$srcDir/$abi")`
`120`	`120`	`archiveFileName = "libpythonsitepackages.so"`
`121`	`121`	`destinationDirectory = file("src/main/jniLibs/$abi")`
`122`	`122`	`dependsOn "jniCleanUp_$abi", "untarFile_$abi"`