Fix ManifestMerger issues
Set LOCAL_MIN_SDK_VERSION in CarService so that the build system
doesn't raise the minSdkVersion value specified in the manifest, which
causes ManifestMerger to error when trying to merge it into a package
that specifies a lower minSdkVersion.
Point the android:label from CarService to an app_title resource
string, which matches the tests that embed CarService using
car-service-for-tests and prevents ManifestMerger from erroring on
merging manifests with different values for the application label.
Bug: 78447299
Test: m java
Change-Id: I8c4b2119419d745d0b39f2793153417c8f2efce6
Merged-In: I8c4b2119419d745d0b39f2793153417c8f2efce6
diff --git a/service/Android.mk b/service/Android.mk
index d44ee04..e4c3f80 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -66,6 +66,8 @@
vehicle-hal-support-lib \
car-systemtest \
+LOCAL_MIN_SDK_VERSION := 25
+
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/service/AndroidManifest.xml b/service/AndroidManifest.xml
index e39fb9e..7e2121f 100644
--- a/service/AndroidManifest.xml
+++ b/service/AndroidManifest.xml
@@ -173,7 +173,7 @@
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.MANAGE_USERS" />
- <application android:label="Car service"
+ <application android:label="@string/app_title"
android:directBootAware="true"
android:allowBackup="false"
android:persistent="true">
diff --git a/service/res/values/strings.xml b/service/res/values/strings.xml
index 6cfff9a..b159dd2 100644
--- a/service/res/values/strings.xml
+++ b/service/res/values/strings.xml
@@ -14,6 +14,8 @@
limitations under the License.
-->
<resources>
+ <string name="app_title">Car service</string>
+
<!-- For permissions -->
<!-- Permission text: can access your car's information [CHAR LIMIT=NONE] -->
<string name="car_permission_label">Car information</string>
