diff --git a/aosp_bundler.sh b/aosp_bundler.sh new file mode 100644 index 00000000..b71c41c4 --- /dev/null +++ b/aosp_bundler.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# example applications +mkdir -p ../aosp/packages/apps/DappExample +cp examples/DappExample/app/Android.bp ../aosp/packages/apps/DappExample/ +cp -r examples/DappExample/app/src ../aosp/packages/apps/DappExample/ + diff --git a/examples/DappExample/app/Android.bp b/examples/DappExample/app/Android.bp new file mode 100644 index 00000000..1f35d837 --- /dev/null +++ b/examples/DappExample/app/Android.bp @@ -0,0 +1,8 @@ +android_app { + name: "DappExample", + certificate: "platform", + manifest: "src/main/AndroidManifest.xml", + srcs: ["src/main/java/**/*.java", "src/main/java/**/*.kt"], + android_resource_dirs: ["src/main/res"], + enabled: true, +} diff --git a/examples/serviceexample/.gitignore b/examples/ServiceExample/.gitignore similarity index 100% rename from examples/serviceexample/.gitignore rename to examples/ServiceExample/.gitignore diff --git a/examples/rust-example/android/app/.gitignore b/examples/ServiceExample/app/.gitignore similarity index 100% rename from examples/rust-example/android/app/.gitignore rename to examples/ServiceExample/app/.gitignore diff --git a/examples/serviceexample/app/build.gradle.kts b/examples/ServiceExample/app/build.gradle.kts similarity index 100% rename from examples/serviceexample/app/build.gradle.kts rename to examples/ServiceExample/app/build.gradle.kts diff --git a/examples/rust-example/android/app/proguard-rules.pro b/examples/ServiceExample/app/proguard-rules.pro similarity index 100% rename from examples/rust-example/android/app/proguard-rules.pro rename to examples/ServiceExample/app/proguard-rules.pro diff --git a/examples/serviceexample/app/src/androidTest/java/com/example/serviceexample/ExampleInstrumentedTest.kt b/examples/ServiceExample/app/src/androidTest/java/com/example/ServiceExample/ExampleInstrumentedTest.kt similarity index 94% rename from examples/serviceexample/app/src/androidTest/java/com/example/serviceexample/ExampleInstrumentedTest.kt rename to examples/ServiceExample/app/src/androidTest/java/com/example/ServiceExample/ExampleInstrumentedTest.kt index 5867e5cd..ce3ad27a 100644 --- a/examples/serviceexample/app/src/androidTest/java/com/example/serviceexample/ExampleInstrumentedTest.kt +++ b/examples/ServiceExample/app/src/androidTest/java/com/example/ServiceExample/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.example.serviceexample +package com.example.ServiceExample import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/examples/serviceexample/app/src/main/AndroidManifest.xml b/examples/ServiceExample/app/src/main/AndroidManifest.xml similarity index 100% rename from examples/serviceexample/app/src/main/AndroidManifest.xml rename to examples/ServiceExample/app/src/main/AndroidManifest.xml diff --git a/examples/serviceexample/app/src/main/java/com/example/serviceexample/MainActivity.kt b/examples/ServiceExample/app/src/main/java/com/example/ServiceExample/MainActivity.kt similarity index 94% rename from examples/serviceexample/app/src/main/java/com/example/serviceexample/MainActivity.kt rename to examples/ServiceExample/app/src/main/java/com/example/ServiceExample/MainActivity.kt index 7a4c8863..396e094f 100644 --- a/examples/serviceexample/app/src/main/java/com/example/serviceexample/MainActivity.kt +++ b/examples/ServiceExample/app/src/main/java/com/example/ServiceExample/MainActivity.kt @@ -1,4 +1,4 @@ -package com.example.serviceexample +package com.example.ServiceExample import android.content.Intent import android.os.Bundle diff --git a/examples/serviceexample/app/src/main/java/com/example/serviceexample/MyService.kt b/examples/ServiceExample/app/src/main/java/com/example/ServiceExample/MyService.kt similarity index 98% rename from examples/serviceexample/app/src/main/java/com/example/serviceexample/MyService.kt rename to examples/ServiceExample/app/src/main/java/com/example/ServiceExample/MyService.kt index c463e875..202251e5 100644 --- a/examples/serviceexample/app/src/main/java/com/example/serviceexample/MyService.kt +++ b/examples/ServiceExample/app/src/main/java/com/example/ServiceExample/MyService.kt @@ -1,4 +1,4 @@ -package com.example.serviceexample +package com.example.ServiceExample import android.app.Service import android.content.Intent diff --git a/examples/rust-example/android/app/src/main/res/drawable/ic_launcher_background.xml b/examples/ServiceExample/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from examples/rust-example/android/app/src/main/res/drawable/ic_launcher_background.xml rename to examples/ServiceExample/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/examples/rust-example/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/examples/ServiceExample/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from examples/rust-example/android/app/src/main/res/drawable/ic_launcher_foreground.xml rename to examples/ServiceExample/app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/examples/serviceexample/app/src/main/res/layout/activity_main.xml b/examples/ServiceExample/app/src/main/res/layout/activity_main.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/layout/activity_main.xml rename to examples/ServiceExample/app/src/main/res/layout/activity_main.xml diff --git a/examples/serviceexample/app/src/main/res/layout/content_main.xml b/examples/ServiceExample/app/src/main/res/layout/content_main.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/layout/content_main.xml rename to examples/ServiceExample/app/src/main/res/layout/content_main.xml diff --git a/examples/rust-example/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/examples/ServiceExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from examples/rust-example/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to examples/ServiceExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/examples/rust-example/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/examples/ServiceExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from examples/rust-example/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to examples/ServiceExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/examples/rust-example/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/examples/ServiceExample/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from examples/rust-example/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to examples/ServiceExample/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/examples/rust-example/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/examples/ServiceExample/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from examples/rust-example/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to examples/ServiceExample/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/examples/rust-example/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/examples/ServiceExample/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from examples/rust-example/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to examples/ServiceExample/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/examples/rust-example/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/examples/ServiceExample/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from examples/rust-example/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to examples/ServiceExample/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/examples/rust-example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/examples/ServiceExample/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from examples/rust-example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to examples/ServiceExample/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/examples/rust-example/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/examples/ServiceExample/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from examples/rust-example/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to examples/ServiceExample/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/examples/rust-example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/examples/ServiceExample/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from examples/rust-example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to examples/ServiceExample/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/examples/rust-example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/examples/ServiceExample/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from examples/rust-example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to examples/ServiceExample/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/examples/rust-example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/examples/ServiceExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from examples/rust-example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to examples/ServiceExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/examples/rust-example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/examples/ServiceExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from examples/rust-example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to examples/ServiceExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/examples/serviceexample/app/src/main/res/navigation/nav_graph.xml b/examples/ServiceExample/app/src/main/res/navigation/nav_graph.xml similarity index 87% rename from examples/serviceexample/app/src/main/res/navigation/nav_graph.xml rename to examples/ServiceExample/app/src/main/res/navigation/nav_graph.xml index bc0a7be1..7496ff24 100644 --- a/examples/serviceexample/app/src/main/res/navigation/nav_graph.xml +++ b/examples/ServiceExample/app/src/main/res/navigation/nav_graph.xml @@ -7,7 +7,7 @@ @@ -17,7 +17,7 @@ diff --git a/examples/serviceexample/app/src/main/res/values-land/dimens.xml b/examples/ServiceExample/app/src/main/res/values-land/dimens.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/values-land/dimens.xml rename to examples/ServiceExample/app/src/main/res/values-land/dimens.xml diff --git a/examples/serviceexample/app/src/main/res/values-night/themes.xml b/examples/ServiceExample/app/src/main/res/values-night/themes.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/values-night/themes.xml rename to examples/ServiceExample/app/src/main/res/values-night/themes.xml diff --git a/examples/serviceexample/app/src/main/res/values-v23/themes.xml b/examples/ServiceExample/app/src/main/res/values-v23/themes.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/values-v23/themes.xml rename to examples/ServiceExample/app/src/main/res/values-v23/themes.xml diff --git a/examples/serviceexample/app/src/main/res/values-w1240dp/dimens.xml b/examples/ServiceExample/app/src/main/res/values-w1240dp/dimens.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/values-w1240dp/dimens.xml rename to examples/ServiceExample/app/src/main/res/values-w1240dp/dimens.xml diff --git a/examples/serviceexample/app/src/main/res/values-w600dp/dimens.xml b/examples/ServiceExample/app/src/main/res/values-w600dp/dimens.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/values-w600dp/dimens.xml rename to examples/ServiceExample/app/src/main/res/values-w600dp/dimens.xml diff --git a/examples/serviceexample/app/src/main/res/values/colors.xml b/examples/ServiceExample/app/src/main/res/values/colors.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/values/colors.xml rename to examples/ServiceExample/app/src/main/res/values/colors.xml diff --git a/examples/serviceexample/app/src/main/res/values/dimens.xml b/examples/ServiceExample/app/src/main/res/values/dimens.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/values/dimens.xml rename to examples/ServiceExample/app/src/main/res/values/dimens.xml diff --git a/examples/serviceexample/app/src/main/res/values/strings.xml b/examples/ServiceExample/app/src/main/res/values/strings.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/values/strings.xml rename to examples/ServiceExample/app/src/main/res/values/strings.xml diff --git a/examples/serviceexample/app/src/main/res/values/themes.xml b/examples/ServiceExample/app/src/main/res/values/themes.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/values/themes.xml rename to examples/ServiceExample/app/src/main/res/values/themes.xml diff --git a/examples/rust-example/android/app/src/main/res/xml/backup_rules.xml b/examples/ServiceExample/app/src/main/res/xml/backup_rules.xml similarity index 100% rename from examples/rust-example/android/app/src/main/res/xml/backup_rules.xml rename to examples/ServiceExample/app/src/main/res/xml/backup_rules.xml diff --git a/examples/rust-example/android/app/src/main/res/xml/data_extraction_rules.xml b/examples/ServiceExample/app/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from examples/rust-example/android/app/src/main/res/xml/data_extraction_rules.xml rename to examples/ServiceExample/app/src/main/res/xml/data_extraction_rules.xml diff --git a/examples/serviceexample/app/src/test/java/com/example/serviceexample/ExampleUnitTest.kt b/examples/ServiceExample/app/src/test/java/com/example/ServiceExample/ExampleUnitTest.kt similarity index 90% rename from examples/serviceexample/app/src/test/java/com/example/serviceexample/ExampleUnitTest.kt rename to examples/ServiceExample/app/src/test/java/com/example/ServiceExample/ExampleUnitTest.kt index 2aa462aa..1fa0687e 100644 --- a/examples/serviceexample/app/src/test/java/com/example/serviceexample/ExampleUnitTest.kt +++ b/examples/ServiceExample/app/src/test/java/com/example/ServiceExample/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.example.serviceexample +package com.example.ServiceExample import org.junit.Test diff --git a/examples/serviceexample/build.gradle.kts b/examples/ServiceExample/build.gradle.kts similarity index 100% rename from examples/serviceexample/build.gradle.kts rename to examples/ServiceExample/build.gradle.kts diff --git a/examples/serviceexample/gradle.properties b/examples/ServiceExample/gradle.properties similarity index 100% rename from examples/serviceexample/gradle.properties rename to examples/ServiceExample/gradle.properties diff --git a/examples/serviceexample/gradle/libs.versions.toml b/examples/ServiceExample/gradle/libs.versions.toml similarity index 100% rename from examples/serviceexample/gradle/libs.versions.toml rename to examples/ServiceExample/gradle/libs.versions.toml diff --git a/examples/rust-example/android/gradle/wrapper/gradle-wrapper.jar b/examples/ServiceExample/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from examples/rust-example/android/gradle/wrapper/gradle-wrapper.jar rename to examples/ServiceExample/gradle/wrapper/gradle-wrapper.jar diff --git a/examples/serviceexample/gradle/wrapper/gradle-wrapper.properties b/examples/ServiceExample/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from examples/serviceexample/gradle/wrapper/gradle-wrapper.properties rename to examples/ServiceExample/gradle/wrapper/gradle-wrapper.properties diff --git a/examples/rust-example/android/gradlew b/examples/ServiceExample/gradlew similarity index 100% rename from examples/rust-example/android/gradlew rename to examples/ServiceExample/gradlew diff --git a/examples/rust-example/android/gradlew.bat b/examples/ServiceExample/gradlew.bat similarity index 100% rename from examples/rust-example/android/gradlew.bat rename to examples/ServiceExample/gradlew.bat diff --git a/examples/serviceexample/settings.gradle.kts b/examples/ServiceExample/settings.gradle.kts similarity index 100% rename from examples/serviceexample/settings.gradle.kts rename to examples/ServiceExample/settings.gradle.kts diff --git a/examples/rust-example/android/.gradle/8.0/checksums/checksums.lock b/examples/rust-example/android/.gradle/8.0/checksums/checksums.lock deleted file mode 100644 index 9810b8a9..00000000 Binary files a/examples/rust-example/android/.gradle/8.0/checksums/checksums.lock and /dev/null differ diff --git a/examples/rust-example/android/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock b/examples/rust-example/android/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock deleted file mode 100644 index 7d93cd08..00000000 Binary files a/examples/rust-example/android/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock and /dev/null differ diff --git a/examples/rust-example/android/.gradle/8.0/dependencies-accessors/gc.properties b/examples/rust-example/android/.gradle/8.0/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/examples/rust-example/android/.gradle/8.0/executionHistory/executionHistory.bin b/examples/rust-example/android/.gradle/8.0/executionHistory/executionHistory.bin deleted file mode 100644 index b336f8b3..00000000 Binary files a/examples/rust-example/android/.gradle/8.0/executionHistory/executionHistory.bin and /dev/null differ diff --git a/examples/rust-example/android/.gradle/8.0/executionHistory/executionHistory.lock b/examples/rust-example/android/.gradle/8.0/executionHistory/executionHistory.lock deleted file mode 100644 index 82bf9520..00000000 Binary files a/examples/rust-example/android/.gradle/8.0/executionHistory/executionHistory.lock and /dev/null differ diff --git a/examples/rust-example/android/.gradle/8.0/fileChanges/last-build.bin b/examples/rust-example/android/.gradle/8.0/fileChanges/last-build.bin deleted file mode 100644 index f76dd238..00000000 Binary files a/examples/rust-example/android/.gradle/8.0/fileChanges/last-build.bin and /dev/null differ diff --git a/examples/rust-example/android/.gradle/8.0/fileHashes/fileHashes.bin b/examples/rust-example/android/.gradle/8.0/fileHashes/fileHashes.bin deleted file mode 100644 index f9816442..00000000 Binary files a/examples/rust-example/android/.gradle/8.0/fileHashes/fileHashes.bin and /dev/null differ diff --git a/examples/rust-example/android/.gradle/8.0/fileHashes/fileHashes.lock b/examples/rust-example/android/.gradle/8.0/fileHashes/fileHashes.lock deleted file mode 100644 index dc733418..00000000 Binary files a/examples/rust-example/android/.gradle/8.0/fileHashes/fileHashes.lock and /dev/null differ diff --git a/examples/rust-example/android/.gradle/8.0/fileHashes/resourceHashesCache.bin b/examples/rust-example/android/.gradle/8.0/fileHashes/resourceHashesCache.bin deleted file mode 100644 index d3d24dc1..00000000 Binary files a/examples/rust-example/android/.gradle/8.0/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/examples/rust-example/android/.gradle/8.0/gc.properties b/examples/rust-example/android/.gradle/8.0/gc.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/examples/rust-example/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/examples/rust-example/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index 6c9057f7..00000000 Binary files a/examples/rust-example/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/examples/rust-example/android/.gradle/buildOutputCleanup/cache.properties b/examples/rust-example/android/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 3adf6abd..00000000 --- a/examples/rust-example/android/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Tue Aug 06 06:20:20 CDT 2024 -gradle.version=8.0 diff --git a/examples/rust-example/android/.gradle/buildOutputCleanup/outputFiles.bin b/examples/rust-example/android/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index 74df3455..00000000 Binary files a/examples/rust-example/android/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/examples/rust-example/android/.gradle/config.properties b/examples/rust-example/android/.gradle/config.properties deleted file mode 100644 index c97fd355..00000000 --- a/examples/rust-example/android/.gradle/config.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Tue Aug 06 06:20:19 CDT 2024 -java.home=/snap/android-studio/161/jbr diff --git a/examples/rust-example/android/.gradle/file-system.probe b/examples/rust-example/android/.gradle/file-system.probe deleted file mode 100644 index 091aeac3..00000000 Binary files a/examples/rust-example/android/.gradle/file-system.probe and /dev/null differ diff --git a/examples/rust-example/android/.gradle/vcs-1/gc.properties b/examples/rust-example/android/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/examples/rust-example/android/.idea/.gitignore b/examples/rust-example/android/.idea/.gitignore deleted file mode 100644 index 26d33521..00000000 --- a/examples/rust-example/android/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/examples/rust-example/android/.idea/.name b/examples/rust-example/android/.idea/.name deleted file mode 100644 index d2ef7b2e..00000000 --- a/examples/rust-example/android/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -rust-example \ No newline at end of file diff --git a/examples/rust-example/android/.idea/compiler.xml b/examples/rust-example/android/.idea/compiler.xml deleted file mode 100644 index b589d56e..00000000 --- a/examples/rust-example/android/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/rust-example/android/.idea/deploymentTargetSelector.xml b/examples/rust-example/android/.idea/deploymentTargetSelector.xml deleted file mode 100644 index fc8303f9..00000000 --- a/examples/rust-example/android/.idea/deploymentTargetSelector.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/examples/rust-example/android/.idea/gradle.xml b/examples/rust-example/android/.idea/gradle.xml deleted file mode 100644 index 0897082f..00000000 --- a/examples/rust-example/android/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/examples/rust-example/android/.idea/kotlinc.xml b/examples/rust-example/android/.idea/kotlinc.xml deleted file mode 100644 index fdf8d994..00000000 --- a/examples/rust-example/android/.idea/kotlinc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/examples/rust-example/android/.idea/migrations.xml b/examples/rust-example/android/.idea/migrations.xml deleted file mode 100644 index f8051a6f..00000000 --- a/examples/rust-example/android/.idea/migrations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/rust-example/android/.idea/misc.xml b/examples/rust-example/android/.idea/misc.xml deleted file mode 100644 index 8978d23d..00000000 --- a/examples/rust-example/android/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/examples/rust-example/android/.idea/other.xml b/examples/rust-example/android/.idea/other.xml deleted file mode 100644 index 4604c446..00000000 --- a/examples/rust-example/android/.idea/other.xml +++ /dev/null @@ -1,252 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/rust-example/android/.idea/vcs.xml b/examples/rust-example/android/.idea/vcs.xml deleted file mode 100644 index c2365ab1..00000000 --- a/examples/rust-example/android/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/rust-example/android/app/src/main/jni/x86_64/libexample_rust_project.so b/examples/rust-example/android/app/src/main/jni/x86_64/libexample_rust_project.so deleted file mode 100755 index 1fa7fb0a..00000000 Binary files a/examples/rust-example/android/app/src/main/jni/x86_64/libexample_rust_project.so and /dev/null differ diff --git a/examples/rust-example/README.md b/examples/rust-service/README.md similarity index 100% rename from examples/rust-example/README.md rename to examples/rust-service/README.md diff --git a/examples/serviceexample/app/.gitignore b/examples/rust-service/RustAndroidExample/app/.gitignore similarity index 100% rename from examples/serviceexample/app/.gitignore rename to examples/rust-service/RustAndroidExample/app/.gitignore diff --git a/examples/rust-example/android/app/build.gradle.kts b/examples/rust-service/RustAndroidExample/app/build.gradle.kts similarity index 100% rename from examples/rust-example/android/app/build.gradle.kts rename to examples/rust-service/RustAndroidExample/app/build.gradle.kts diff --git a/examples/rust-service/RustAndroidExample/app/local.properties b/examples/rust-service/RustAndroidExample/app/local.properties new file mode 100644 index 00000000..06df02e6 --- /dev/null +++ b/examples/rust-service/RustAndroidExample/app/local.properties @@ -0,0 +1,8 @@ +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Fri Dec 20 23:47:28 CST 2024 +sdk.dir=/home/thomas/Android/Sdk diff --git a/examples/serviceexample/app/proguard-rules.pro b/examples/rust-service/RustAndroidExample/app/proguard-rules.pro similarity index 100% rename from examples/serviceexample/app/proguard-rules.pro rename to examples/rust-service/RustAndroidExample/app/proguard-rules.pro diff --git a/examples/rust-example/android/app/src/androidTest/java/com/example/rust_example/ExampleInstrumentedTest.kt b/examples/rust-service/RustAndroidExample/app/src/androidTest/java/com/example/rust_example/ExampleInstrumentedTest.kt similarity index 100% rename from examples/rust-example/android/app/src/androidTest/java/com/example/rust_example/ExampleInstrumentedTest.kt rename to examples/rust-service/RustAndroidExample/app/src/androidTest/java/com/example/rust_example/ExampleInstrumentedTest.kt diff --git a/examples/rust-example/android/app/src/main/AndroidManifest.xml b/examples/rust-service/RustAndroidExample/app/src/main/AndroidManifest.xml similarity index 100% rename from examples/rust-example/android/app/src/main/AndroidManifest.xml rename to examples/rust-service/RustAndroidExample/app/src/main/AndroidManifest.xml diff --git a/examples/rust-example/android/app/src/main/java/com/example/rust_example/MainActivity.kt b/examples/rust-service/RustAndroidExample/app/src/main/java/com/example/rust_example/MainActivity.kt similarity index 100% rename from examples/rust-example/android/app/src/main/java/com/example/rust_example/MainActivity.kt rename to examples/rust-service/RustAndroidExample/app/src/main/java/com/example/rust_example/MainActivity.kt diff --git a/examples/rust-example/android/app/src/main/java/com/example/rust_example/RustLib.class b/examples/rust-service/RustAndroidExample/app/src/main/java/com/example/rust_example/RustLib.class similarity index 100% rename from examples/rust-example/android/app/src/main/java/com/example/rust_example/RustLib.class rename to examples/rust-service/RustAndroidExample/app/src/main/java/com/example/rust_example/RustLib.class diff --git a/examples/rust-example/android/app/src/main/java/com/example/rust_example/RustLib.java b/examples/rust-service/RustAndroidExample/app/src/main/java/com/example/rust_example/RustLib.java similarity index 100% rename from examples/rust-example/android/app/src/main/java/com/example/rust_example/RustLib.java rename to examples/rust-service/RustAndroidExample/app/src/main/java/com/example/rust_example/RustLib.java diff --git a/examples/rust-example/android/app/src/main/java/com/example/rust_example/com_example_rust_example_RustLib.h b/examples/rust-service/RustAndroidExample/app/src/main/java/com/example/rust_example/com_example_rust_example_RustLib.h similarity index 100% rename from examples/rust-example/android/app/src/main/java/com/example/rust_example/com_example_rust_example_RustLib.h rename to examples/rust-service/RustAndroidExample/app/src/main/java/com/example/rust_example/com_example_rust_example_RustLib.h diff --git a/examples/serviceexample/app/src/main/res/drawable/ic_launcher_background.xml b/examples/rust-service/RustAndroidExample/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/drawable/ic_launcher_background.xml rename to examples/rust-service/RustAndroidExample/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/examples/serviceexample/app/src/main/res/drawable/ic_launcher_foreground.xml b/examples/rust-service/RustAndroidExample/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/drawable/ic_launcher_foreground.xml rename to examples/rust-service/RustAndroidExample/app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/examples/rust-example/android/app/src/main/res/layout/activity_main.xml b/examples/rust-service/RustAndroidExample/app/src/main/res/layout/activity_main.xml similarity index 100% rename from examples/rust-example/android/app/src/main/res/layout/activity_main.xml rename to examples/rust-service/RustAndroidExample/app/src/main/res/layout/activity_main.xml diff --git a/examples/serviceexample/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/examples/serviceexample/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/examples/serviceexample/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from examples/serviceexample/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/examples/serviceexample/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from examples/serviceexample/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/examples/serviceexample/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from examples/serviceexample/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/examples/serviceexample/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from examples/serviceexample/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/examples/serviceexample/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from examples/serviceexample/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/examples/serviceexample/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from examples/serviceexample/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/examples/serviceexample/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from examples/serviceexample/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/examples/serviceexample/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from examples/serviceexample/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/examples/serviceexample/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from examples/serviceexample/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/examples/serviceexample/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from examples/serviceexample/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to examples/rust-service/RustAndroidExample/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/examples/rust-example/android/app/src/main/res/values-night/themes.xml b/examples/rust-service/RustAndroidExample/app/src/main/res/values-night/themes.xml similarity index 100% rename from examples/rust-example/android/app/src/main/res/values-night/themes.xml rename to examples/rust-service/RustAndroidExample/app/src/main/res/values-night/themes.xml diff --git a/examples/rust-example/android/app/src/main/res/values/colors.xml b/examples/rust-service/RustAndroidExample/app/src/main/res/values/colors.xml similarity index 100% rename from examples/rust-example/android/app/src/main/res/values/colors.xml rename to examples/rust-service/RustAndroidExample/app/src/main/res/values/colors.xml diff --git a/examples/rust-example/android/app/src/main/res/values/strings.xml b/examples/rust-service/RustAndroidExample/app/src/main/res/values/strings.xml similarity index 100% rename from examples/rust-example/android/app/src/main/res/values/strings.xml rename to examples/rust-service/RustAndroidExample/app/src/main/res/values/strings.xml diff --git a/examples/rust-example/android/app/src/main/res/values/themes.xml b/examples/rust-service/RustAndroidExample/app/src/main/res/values/themes.xml similarity index 100% rename from examples/rust-example/android/app/src/main/res/values/themes.xml rename to examples/rust-service/RustAndroidExample/app/src/main/res/values/themes.xml diff --git a/examples/serviceexample/app/src/main/res/xml/backup_rules.xml b/examples/rust-service/RustAndroidExample/app/src/main/res/xml/backup_rules.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/xml/backup_rules.xml rename to examples/rust-service/RustAndroidExample/app/src/main/res/xml/backup_rules.xml diff --git a/examples/serviceexample/app/src/main/res/xml/data_extraction_rules.xml b/examples/rust-service/RustAndroidExample/app/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from examples/serviceexample/app/src/main/res/xml/data_extraction_rules.xml rename to examples/rust-service/RustAndroidExample/app/src/main/res/xml/data_extraction_rules.xml diff --git a/examples/rust-example/android/app/src/test/java/com/example/rust_example/ExampleUnitTest.kt b/examples/rust-service/RustAndroidExample/app/src/test/java/com/example/rust_example/ExampleUnitTest.kt similarity index 100% rename from examples/rust-example/android/app/src/test/java/com/example/rust_example/ExampleUnitTest.kt rename to examples/rust-service/RustAndroidExample/app/src/test/java/com/example/rust_example/ExampleUnitTest.kt diff --git a/examples/rust-example/android/build.gradle.kts b/examples/rust-service/RustAndroidExample/build.gradle.kts similarity index 100% rename from examples/rust-example/android/build.gradle.kts rename to examples/rust-service/RustAndroidExample/build.gradle.kts diff --git a/examples/rust-example/android/gradle.properties b/examples/rust-service/RustAndroidExample/gradle.properties similarity index 100% rename from examples/rust-example/android/gradle.properties rename to examples/rust-service/RustAndroidExample/gradle.properties diff --git a/examples/serviceexample/gradle/wrapper/gradle-wrapper.jar b/examples/rust-service/RustAndroidExample/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from examples/serviceexample/gradle/wrapper/gradle-wrapper.jar rename to examples/rust-service/RustAndroidExample/gradle/wrapper/gradle-wrapper.jar diff --git a/examples/rust-example/android/gradle/wrapper/gradle-wrapper.properties b/examples/rust-service/RustAndroidExample/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from examples/rust-example/android/gradle/wrapper/gradle-wrapper.properties rename to examples/rust-service/RustAndroidExample/gradle/wrapper/gradle-wrapper.properties diff --git a/examples/serviceexample/gradlew b/examples/rust-service/RustAndroidExample/gradlew similarity index 100% rename from examples/serviceexample/gradlew rename to examples/rust-service/RustAndroidExample/gradlew diff --git a/examples/serviceexample/gradlew.bat b/examples/rust-service/RustAndroidExample/gradlew.bat similarity index 100% rename from examples/serviceexample/gradlew.bat rename to examples/rust-service/RustAndroidExample/gradlew.bat diff --git a/examples/rust-example/android/local.properties b/examples/rust-service/RustAndroidExample/local.properties similarity index 100% rename from examples/rust-example/android/local.properties rename to examples/rust-service/RustAndroidExample/local.properties diff --git a/examples/rust-example/android/settings.gradle.kts b/examples/rust-service/RustAndroidExample/settings.gradle.kts similarity index 88% rename from examples/rust-example/android/settings.gradle.kts rename to examples/rust-service/RustAndroidExample/settings.gradle.kts index 29b93d63..5e1bce71 100644 --- a/examples/rust-example/android/settings.gradle.kts +++ b/examples/rust-service/RustAndroidExample/settings.gradle.kts @@ -13,5 +13,5 @@ dependencyResolutionManagement { } } -rootProject.name = "rust-example" +rootProject.name = "RustAndroidExample" include(":app") diff --git a/examples/rust-example/rust/example_rust_project/.gitignore b/examples/rust-service/example_rust_project/.gitignore similarity index 100% rename from examples/rust-example/rust/example_rust_project/.gitignore rename to examples/rust-service/example_rust_project/.gitignore diff --git a/examples/rust-example/rust/example_rust_project/Cargo.lock b/examples/rust-service/example_rust_project/Cargo.lock similarity index 100% rename from examples/rust-example/rust/example_rust_project/Cargo.lock rename to examples/rust-service/example_rust_project/Cargo.lock diff --git a/examples/rust-example/rust/example_rust_project/Cargo.toml b/examples/rust-service/example_rust_project/Cargo.toml similarity index 100% rename from examples/rust-example/rust/example_rust_project/Cargo.toml rename to examples/rust-service/example_rust_project/Cargo.toml diff --git a/examples/rust-example/rust/example_rust_project/Makefile b/examples/rust-service/example_rust_project/Makefile similarity index 100% rename from examples/rust-example/rust/example_rust_project/Makefile rename to examples/rust-service/example_rust_project/Makefile diff --git a/examples/rust-example/rust/example_rust_project/build.rs b/examples/rust-service/example_rust_project/build.rs similarity index 100% rename from examples/rust-example/rust/example_rust_project/build.rs rename to examples/rust-service/example_rust_project/build.rs diff --git a/examples/rust-example/rust/example_rust_project/src/android.rs b/examples/rust-service/example_rust_project/src/android.rs similarity index 100% rename from examples/rust-example/rust/example_rust_project/src/android.rs rename to examples/rust-service/example_rust_project/src/android.rs diff --git a/examples/rust-example/rust/example_rust_project/src/lib.rs b/examples/rust-service/example_rust_project/src/lib.rs similarity index 100% rename from examples/rust-example/rust/example_rust_project/src/lib.rs rename to examples/rust-service/example_rust_project/src/lib.rs diff --git a/examples/serviceexample/.idea/.gitignore b/examples/serviceexample/.idea/.gitignore deleted file mode 100644 index 26d33521..00000000 --- a/examples/serviceexample/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/examples/serviceexample/.idea/.name b/examples/serviceexample/.idea/.name deleted file mode 100644 index 794c08be..00000000 --- a/examples/serviceexample/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -service example \ No newline at end of file diff --git a/examples/serviceexample/.idea/compiler.xml b/examples/serviceexample/.idea/compiler.xml deleted file mode 100644 index b589d56e..00000000 --- a/examples/serviceexample/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/serviceexample/.idea/deploymentTargetSelector.xml b/examples/serviceexample/.idea/deploymentTargetSelector.xml deleted file mode 100644 index b268ef36..00000000 --- a/examples/serviceexample/.idea/deploymentTargetSelector.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/examples/serviceexample/.idea/gradle.xml b/examples/serviceexample/.idea/gradle.xml deleted file mode 100644 index 0897082f..00000000 --- a/examples/serviceexample/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/examples/serviceexample/.idea/kotlinc.xml b/examples/serviceexample/.idea/kotlinc.xml deleted file mode 100644 index fdf8d994..00000000 --- a/examples/serviceexample/.idea/kotlinc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/examples/serviceexample/.idea/migrations.xml b/examples/serviceexample/.idea/migrations.xml deleted file mode 100644 index f8051a6f..00000000 --- a/examples/serviceexample/.idea/migrations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/serviceexample/.idea/misc.xml b/examples/serviceexample/.idea/misc.xml deleted file mode 100644 index 8978d23d..00000000 --- a/examples/serviceexample/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/examples/serviceexample/.idea/other.xml b/examples/serviceexample/.idea/other.xml deleted file mode 100644 index 94c96f63..00000000 --- a/examples/serviceexample/.idea/other.xml +++ /dev/null @@ -1,318 +0,0 @@ - - - - - - \ No newline at end of file