Remove car-ui-lib-overlayable
car-ui-lib now include an overlayable.xml file
by default, so there's no reasong to have a
separate build target.
Fixes: 185809785
Test: Manually
Change-Id: Iad9ddb6b26b576067b92e3c67cb4ae263ec04d1d
diff --git a/car-ui-lib/Android.bp b/car-ui-lib/Android.bp
index b8a6a0f..3a188cd 100644
--- a/car-ui-lib/Android.bp
+++ b/car-ui-lib/Android.bp
@@ -51,26 +51,6 @@
],
}
-// User this if your project includes overlayable.xml
-android_library {
- name: "car-ui-lib-overlayable",
-
- sdk_version: "current",
- min_sdk_version: "28",
- target_sdk_version: "30",
-
- manifest: "car-ui-lib/src/main/AndroidManifest.xml",
- static_libs: [
- "car-ui-lib",
- ],
- // This is also needed for `car-ui-lib` build target.
- // But it's not in explicitly added to the build rule,
- // Because it's hardcoded in apex.go file under Soong.
- apex_available: [
- "com.android.permission",
- ],
-}
-
android_library {
name: "car-ui-lib-testing-support",
diff --git a/car-ui-lib/referencedesign/Android.mk b/car-ui-lib/referencedesign/Android.mk
index efac033..75ad6cc 100644
--- a/car-ui-lib/referencedesign/Android.mk
+++ b/car-ui-lib/referencedesign/Android.mk
@@ -5,23 +5,6 @@
CAR_UI_RRO_MANIFEST_FILE := $(LOCAL_PATH)/AndroidManifest.xml
CAR_UI_RESOURCE_DIR := $(LOCAL_PATH)/res
CAR_UI_RRO_TARGETS := \
- com.google.android.apps.automotive.inputmethod \
- com.google.android.apps.automotive.inputmethod.dev \
- com.google.android.apps.automotive.templates.host \
- com.google.android.embedded.projection \
- com.google.android.gms \
- com.google.android.gsf \
- com.google.android.packageinstaller \
- com.google.android.carassistant \
- com.google.android.tts \
- com.android.vending \
-
-include packages/apps/Car/libs/car-ui-lib/generate_rros.mk
-
-CAR_UI_RRO_SET_NAME := googlecarui.overlayable
-CAR_UI_RRO_MANIFEST_FILE := $(LOCAL_PATH)/AndroidManifest-overlayable.xml
-CAR_UI_RESOURCE_DIR := $(LOCAL_PATH)/res
-CAR_UI_RRO_TARGETS := \
com.android.car.ui.paintbooth \
com.google.android.car.ui.paintbooth \
com.google.android.carui.ats \
diff --git a/car-ui-lib/referencedesign/AndroidManifest-overlayable.xml b/car-ui-lib/referencedesign/AndroidManifest-overlayable.xml
deleted file mode 100644
index 1b0585a..0000000
--- a/car-ui-lib/referencedesign/AndroidManifest-overlayable.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="{{RRO_PACKAGE_NAME}}">
- <application android:hasCode="false"/>
- <overlay android:priority="10"
- android:targetPackage="{{TARGET_PACKAGE_NAME}}"
- android:targetName="car-ui-lib"
- android:resourcesMap="@xml/overlays"
- android:isStatic="true"
- android:requiredSystemPropertyName="ro.build.car_ui_rros_enabled"
- android:requiredSystemPropertyValue="true"/>
-</manifest>
diff --git a/car-ui-lib/referencedesign/AndroidManifest.xml b/car-ui-lib/referencedesign/AndroidManifest.xml
index 0994382..1b0585a 100644
--- a/car-ui-lib/referencedesign/AndroidManifest.xml
+++ b/car-ui-lib/referencedesign/AndroidManifest.xml
@@ -3,6 +3,7 @@
<application android:hasCode="false"/>
<overlay android:priority="10"
android:targetPackage="{{TARGET_PACKAGE_NAME}}"
+ android:targetName="car-ui-lib"
android:resourcesMap="@xml/overlays"
android:isStatic="true"
android:requiredSystemPropertyName="ro.build.car_ui_rros_enabled"
diff --git a/car-ui-lib/referencedesign/product.mk b/car-ui-lib/referencedesign/product.mk
index 7697526..64dc71f 100644
--- a/car-ui-lib/referencedesign/product.mk
+++ b/car-ui-lib/referencedesign/product.mk
@@ -12,6 +12,25 @@
# Include generated RROs
PRODUCT_PACKAGES += \
+ googlecarui-com-android-car-ui-paintbooth \
+ googlecarui-com-google-android-car-ui-paintbooth \
+ googlecarui-com-google-android-carui-ats \
+ googlecarui-com-android-car-rotaryplayground \
+ googlecarui-com-android-car-themeplayground \
+ googlecarui-com-android-car-carlauncher \
+ googlecarui-com-android-car-home \
+ googlecarui-com-android-car-media \
+ googlecarui-com-android-car-radio \
+ googlecarui-com-android-car-calendar \
+ googlecarui-com-android-car-companiondevicesupport \
+ googlecarui-com-android-car-systemupdater \
+ googlecarui-com-android-car-dialer \
+ googlecarui-com-android-car-linkviewer \
+ googlecarui-com-android-car-settings \
+ googlecarui-com-android-car-voicecontrol \
+ googlecarui-com-android-car-faceenroll \
+ googlecarui-com-android-managedprovisioning \
+ googlecarui-com-android-settings-intelligence \
googlecarui-com-google-android-apps-automotive-inputmethod \
googlecarui-com-google-android-apps-automotive-inputmethod-dev \
googlecarui-com-google-android-apps-automotive-templates-host \
@@ -19,44 +38,11 @@
googlecarui-com-google-android-gms \
googlecarui-com-google-android-gsf \
googlecarui-com-google-android-packageinstaller \
+ googlecarui-com-google-android-permissioncontroller \
googlecarui-com-google-android-carassistant \
googlecarui-com-google-android-tts \
googlecarui-com-android-vending \
-
-# Include generated RROs that that use targetName
-PRODUCT_PACKAGES += \
- googlecarui-overlayable-com-android-car-ui-paintbooth \
- googlecarui-overlayable-com-google-android-car-ui-paintbooth \
- googlecarui-overlayable-com-google-android-carui-ats \
- googlecarui-overlayable-com-android-car-rotaryplayground \
- googlecarui-overlayable-com-android-car-themeplayground \
- googlecarui-overlayable-com-android-car-carlauncher \
- googlecarui-overlayable-com-android-car-home \
- googlecarui-overlayable-com-android-car-media \
- googlecarui-overlayable-com-android-car-radio \
- googlecarui-overlayable-com-android-car-calendar \
- googlecarui-overlayable-com-android-car-companiondevicesupport \
- googlecarui-overlayable-com-android-car-systemupdater \
- googlecarui-overlayable-com-android-car-dialer \
- googlecarui-overlayable-com-android-car-linkviewer \
- googlecarui-overlayable-com-android-car-settings \
- googlecarui-overlayable-com-android-car-voicecontrol \
- googlecarui-overlayable-com-android-car-faceenroll \
- googlecarui-overlayable-com-android-managedprovisioning \
- googlecarui-overlayable-com-android-settings-intelligence \
- googlecarui-overlayable-com-google-android-apps-automotive-inputmethod \
- googlecarui-overlayable-com-google-android-apps-automotive-inputmethod-dev \
- googlecarui-overlayable-com-google-android-apps-automotive-templates-host \
- googlecarui-overlayable-com-google-android-embedded-projection \
- googlecarui-overlayable-com-google-android-gms \
- googlecarui-overlayable-com-google-android-gsf \
- googlecarui-overlayable-com-google-android-packageinstaller \
- googlecarui-overlayable-com-google-android-permissioncontroller \
- googlecarui-overlayable-com-google-android-carassistant \
- googlecarui-overlayable-com-google-android-tts \
- googlecarui-overlayable-com-android-vending \
-
# This system property is used to enable the RROs on startup via
# the requiredSystemPropertyName/Value attributes in the manifest
PRODUCT_PRODUCT_PROPERTIES += ro.build.car_ui_rros_enabled=true
