From d9081fab595801deb35b2efdbaa8d2e4bc01c884 Mon Sep 17 00:00:00 2001
From: oxmc <67136658+oxmc@users.noreply.github.com>
Date: Wed, 15 Jul 2026 15:46:33 -0700
Subject: [PATCH] Android.bp: use a Soong-only manifest with an explicit
 package attribute
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Soong's manifest fixer requires package= in the manifest, but AGP 8+
derives it from the Gradle namespace and rejects the attribute in the
shared manifest — so give the AOSP build its own copy.
---
 Android.bp                |  4 +++-
 AndroidManifest-soong.xml | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 AndroidManifest-soong.xml

diff --git a/Android.bp b/Android.bp
index 7fa04ba..9f0deb9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,6 +1,8 @@
 android_library {
     name: "android-device-info",
-    manifest: "library/src/main/AndroidManifest.xml",
+    // Soong-only copy with an explicit package attribute — Gradle's manifest
+    // relies on `namespace` in build.gradle.kts, which Soong cannot read.
+    manifest: "AndroidManifest-soong.xml",
     srcs: ["library/src/main/java/**/*.kt"],
     asset_dirs: ["library/src/main/assets"],
     sdk_version: "current",
diff --git a/AndroidManifest-soong.xml b/AndroidManifest-soong.xml
new file mode 100644
index 0000000..043d85f
--- /dev/null
+++ b/AndroidManifest-soong.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Soong-only manifest. Gradle derives the package from `namespace` in
+    library/build.gradle.kts and AGP 8+ rejects a package attribute there,
+    but Soong's manifest fixer requires one — so the AOSP build uses this
+    copy instead of library/src/main/AndroidManifest.xml.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="dev.oxmc.androiddeviceinfo">
+
+    <!-- The library does not require any specific permissions, but if you want to auto update the db, you will need the INTERNET permisson. -->
+    <uses-permission android:name="android.permission.INTERNET" />
+
+</manifest>