Skip to content

Fix merge manifest issue causing platform samples not to build #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alabiaga merged 8 commits into from
Sep 30, 2025
Merged

Fix merge manifest issue causing platform samples not to build #371

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9c832bb
fix build issue due merge manifest issue
alabiaga Sep 26, 2025
51f2ff7
Merge branch 'android:main' into main
alabiaga Sep 26, 2025
2704f74
gradle wrapper verification fix
alabiaga Sep 26, 2025
eb5c628
lint fix
alabiaga Sep 29, 2025
2aaa207
fix min sdk version issue
alabiaga Sep 29, 2025
3ce7143
fix min sdk
alabiaga Sep 29, 2025
83b0eb7
fix min sdk
alabiaga Sep 30, 2025
87d5e69
Update AndroidManifest.xml
alabiaga Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,24 @@
~ limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<!--
Module :samples:storage uses an androidx lib that requires a min sdk of 34.
Rather than updating the main app's minSdk, override those libraries minSdk.
Removing this would otherwise cause Manifest merger issue.
See https://developer.android.com/build/manage-manifests#merge_conflict_heuristics
-->
<uses-sdk tools:overrideLibrary="com.example.platform.storage, androidx.photopicker.compose"/>

<application
android:enableOnBackInvokedCallback="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher"
android:supportsRtl="true">

<activity
android:name=".app.MainActivity"
android:exported="true"
Expand All @@ -33,7 +43,7 @@
</intent-filter>
</activity>

<!--required for TFLite/LiteRT style transfer demo -->
<!--required for TFLite/LiteRT style transfer demo -->
<uses-library
android:name="libOpenCL.so"
android:required="false" />
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/example/platform/app/ApiSurface.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ val PrivacyTransparencyApiSurface = ApiSurface(
val StorageApiSurface = ApiSurface(
"storage",
"Storage",
"Android photo library access capabilities.\nPhoto Picker for unified device and cloud photo access, and MediaStore for detailed local media querying",
"Android photo library access capabilities.\nPhoto Picker for unified device and "
+ "cloud photo access, and MediaStore for detailed local media querying.\n\n"
+ "WARNING: These samples only work on devices with Android 14 or higher."
)

val UserInterfaceAppWidgetsApiSurface = ApiSurface(
Expand Down
Loading