Merge "Add initial MIC e-label for JP SKU of HK3 and SB3"

device-husky.mk

@@ -194,7 +194,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += \
-    device/google/shusky/powerstats/husky
+    device/google/shusky/powerstats/husky \
+    device/google/shusky
 
 # WiFi Overlay
 PRODUCT_PACKAGES += \
@@ -272,3 +273,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # PKVM Memory Reclaim
 PRODUCT_VENDOR_PROPERTIES += \
     hypervisor.memory_reclaim.supported=1
+
+# SKU specific RROs
+PRODUCT_PACKAGES += \
+    SettingsOverlayGE9DP

device-shiba.mk

@@ -193,7 +193,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += \
-    device/google/shusky/powerstats/shiba
+    device/google/shusky/powerstats/shiba \
+    device/google/shusky
 
 # WiFi Overlay
 PRODUCT_PACKAGES += \
@@ -265,3 +266,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # PKVM Memory Reclaim
 PRODUCT_VENDOR_PROPERTIES += \
     hypervisor.memory_reclaim.supported=1
+
+# SKU specific RROs
+PRODUCT_PACKAGES += \
+    SettingsOverlayGZPF0

husky/overlay_packages/SettingsOverlayGE9DP/Android.bp

@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayGE9DP",
+    product_specific: true,
+}

husky/overlay_packages/SettingsOverlayGE9DP/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.ge9dp">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="GE9DP"
+             android:isStatic="true" />
+</manifest>

shiba/overlay_packages/SettingsOverlayGZPF0/Android.bp

@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayGZPF0",
+    product_specific: true,
+}

shiba/overlay_packages/SettingsOverlayGZPF0/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.gzpf0">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="GZPF0"
+             android:isStatic="true" />
+</manifest>