Fix ManifestMerger issues
Set LOCAL_MIN_SDK_VERSION in car-settings-lib 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.
Remove the empty application with an android:label from
car-stream-ui-lib which causes ManifestMerger to error when combining
two applications with different labels.
Bug: 78447299
Test: m java
Change-Id: I12230134d53a949a0e52dba7224cbec882fd8380
diff --git a/car-stream-lib/Android.mk b/car-stream-lib/Android.mk
index 56dc74f..c1ca5c9 100644
--- a/car-stream-lib/Android.mk
+++ b/car-stream-lib/Android.mk
@@ -26,4 +26,6 @@
LOCAL_STATIC_JAVA_LIBRARIES += android-support-annotations
endif
+LOCAL_MIN_SDK_VERSION := 24
+
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/car-stream-ui-lib/AndroidManifest.xml b/car-stream-ui-lib/AndroidManifest.xml
index 1fe75b4..dd9e224 100644
--- a/car-stream-ui-lib/AndroidManifest.xml
+++ b/car-stream-ui-lib/AndroidManifest.xml
@@ -20,6 +20,4 @@
<uses-sdk
android:minSdkVersion="22"
android:targetSdkVersion='23'/>
-
- <application android:label="CarStreamCard" />
</manifest>
