Create group throttle powerhint am: 03f3dc0c29 am: be9c39bf51
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/23613337
Change-Id: I3eba63206736d6d698e7a1eb483e3171aaf171f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/device-oriole.mk b/device-oriole.mk
index d230c70..5e83035 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -14,6 +14,9 @@
# limitations under the License.
#
+# Restrict the visibility of Android.bp files to improve build analysis time
+$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
+
TARGET_KERNEL_DIR ?= device/google/raviole-kernel
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
@@ -70,6 +73,9 @@
PRODUCT_COPY_FILES += \
device/google/raviole/powerhint-oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
+# Bluetooth sepolicy
+include device/google/gs101-sepolicy/oriole-sepolicy.mk
+
# Bluetooth
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.a2dp_aac.vbr_supported=true \
@@ -77,12 +83,12 @@
# Bluetooth Tx power caps for oriole
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/bluetooth_power_limits_oriole.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
- $(LOCAL_PATH)/bluetooth_power_limits_oriole_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \
- $(LOCAL_PATH)/bluetooth_power_limits_G9S9B_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G9S9B_US.csv \
- $(LOCAL_PATH)/bluetooth_power_limits_GB7N6_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_US.csv \
- $(LOCAL_PATH)/bluetooth_power_limits_G9S9B_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G9S9B_EU.csv \
- $(LOCAL_PATH)/bluetooth_power_limits_GB7N6_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_EU.csv
+ device/google/raviole/bluetooth_power_limits_oriole.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
+ device/google/raviole/bluetooth_power_limits_oriole_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \
+ device/google/raviole/bluetooth_power_limits_G9S9B_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G9S9B_US.csv \
+ device/google/raviole/bluetooth_power_limits_GB7N6_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_US.csv \
+ device/google/raviole/bluetooth_power_limits_G9S9B_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G9S9B_EU.csv \
+ device/google/raviole/bluetooth_power_limits_GB7N6_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_EU.csv
# Bluetooth Hal Extension test tools
@@ -193,6 +199,10 @@
NoCutoutOverlay \
AvoidAppsInCutoutOverlay
+# Android DeviceAsWebcam specific overlay
+PRODUCT_PACKAGES += \
+ DeviceAsWebcamOriole
+
# SKU specific RROs
PRODUCT_PACKAGES += \
SettingsOverlayGR1YH \
@@ -273,6 +283,10 @@
device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
endif
+# Window Extensions
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
# Disable Settings large-screen optimization enabled by Window Extensions
PRODUCT_SYSTEM_PROPERTIES += \
persist.settings.large_screen_opt.enabled=false
+
diff --git a/device-raven.mk b/device-raven.mk
index 97d6638..1942212 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -14,6 +14,9 @@
# limitations under the License.
#
+# Restrict the visibility of Android.bp files to improve build analysis time
+$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
+
TARGET_KERNEL_DIR ?= device/google/raviole-kernel
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
@@ -81,6 +84,9 @@
PRODUCT_PACKAGES += \
UwbOverlayR4
+# Bluetooth sepolicy
+include device/google/gs101-sepolicy/raven-sepolicy.mk
+
# Bluetooth
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.a2dp_aac.vbr_supported=true \
@@ -88,10 +94,10 @@
# Bluetooth Tx power caps for raven
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/bluetooth_power_limits_raven.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
- $(LOCAL_PATH)/bluetooth_power_limits_raven_us.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv \
- $(LOCAL_PATH)/bluetooth_power_limits_raven_eu.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \
- $(LOCAL_PATH)/bluetooth_power_limits_raven_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv
+ device/google/raviole/bluetooth_power_limits_raven.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
+ device/google/raviole/bluetooth_power_limits_raven_us.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv \
+ device/google/raviole/bluetooth_power_limits_raven_eu.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \
+ device/google/raviole/bluetooth_power_limits_raven_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv
# Bluetooth HAL
PRODUCT_COPY_FILES += \
@@ -205,6 +211,10 @@
NoCutoutOverlay \
AvoidAppsInCutoutOverlay
+# Android DeviceAsWebcam specific overlay
+PRODUCT_PACKAGES += \
+ DeviceAsWebcamRaven
+
# Fingerprint antispoof property
PRODUCT_PRODUCT_PROPERTIES +=\
persist.vendor.fingerprint.disable.fake.override=none
@@ -292,6 +302,10 @@
device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
endif
+# Window Extensions
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
# Disable Settings large-screen optimization enabled by Window Extensions
PRODUCT_SYSTEM_PROPERTIES += \
persist.settings.large_screen_opt.enabled=false
+
diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/Android.bp b/oriole/overlay_packages/DeviceAsWebcamOriole/Android.bp
new file mode 100644
index 0000000..158e2b8
--- /dev/null
+++ b/oriole/overlay_packages/DeviceAsWebcamOriole/Android.bp
@@ -0,0 +1,10 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "DeviceAsWebcamOriole",
+ certificate: "platform",
+ product_specific: true,
+ sdk_version: "current",
+}
diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/AndroidManifest.xml b/oriole/overlay_packages/DeviceAsWebcamOriole/AndroidManifest.xml
new file mode 100644
index 0000000..cc7d3ba
--- /dev/null
+++ b/oriole/overlay_packages/DeviceAsWebcamOriole/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.google.android.overlay.DeviceAsWebcam"
+ android:versionCode="1"
+ android:versionName="1.0" >
+ <application android:hasCode="false" />
+ <overlay
+ android:targetPackage="com.android.DeviceAsWebcam"
+ android:isStatic="true"
+ android:priority="1"/>
+</manifest>
\ No newline at end of file
diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/OWNERS b/oriole/overlay_packages/DeviceAsWebcamOriole/OWNERS
new file mode 100644
index 0000000..d22af85
--- /dev/null
+++ b/oriole/overlay_packages/DeviceAsWebcamOriole/OWNERS
@@ -0,0 +1 @@
+include platform/frameworks/av:/camera/OWNERS
\ No newline at end of file
diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/res/raw/physical_camera_mapping.json b/oriole/overlay_packages/DeviceAsWebcamOriole/res/raw/physical_camera_mapping.json
new file mode 100644
index 0000000..4dd9988
--- /dev/null
+++ b/oriole/overlay_packages/DeviceAsWebcamOriole/res/raw/physical_camera_mapping.json
@@ -0,0 +1 @@
+{"0": {"3" : "UW"}}
\ No newline at end of file
diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/Android.bp b/raven/overlay_packages/DeviceAsWebcamRaven/Android.bp
new file mode 100644
index 0000000..9a0527d
--- /dev/null
+++ b/raven/overlay_packages/DeviceAsWebcamRaven/Android.bp
@@ -0,0 +1,10 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "DeviceAsWebcamRaven",
+ certificate: "platform",
+ product_specific: true,
+ sdk_version: "current",
+}
diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/AndroidManifest.xml b/raven/overlay_packages/DeviceAsWebcamRaven/AndroidManifest.xml
new file mode 100644
index 0000000..cc7d3ba
--- /dev/null
+++ b/raven/overlay_packages/DeviceAsWebcamRaven/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.google.android.overlay.DeviceAsWebcam"
+ android:versionCode="1"
+ android:versionName="1.0" >
+ <application android:hasCode="false" />
+ <overlay
+ android:targetPackage="com.android.DeviceAsWebcam"
+ android:isStatic="true"
+ android:priority="1"/>
+</manifest>
\ No newline at end of file
diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/OWNERS b/raven/overlay_packages/DeviceAsWebcamRaven/OWNERS
new file mode 100644
index 0000000..d22af85
--- /dev/null
+++ b/raven/overlay_packages/DeviceAsWebcamRaven/OWNERS
@@ -0,0 +1 @@
+include platform/frameworks/av:/camera/OWNERS
\ No newline at end of file
diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/res/raw/physical_camera_mapping.json b/raven/overlay_packages/DeviceAsWebcamRaven/res/raw/physical_camera_mapping.json
new file mode 100644
index 0000000..4dd9988
--- /dev/null
+++ b/raven/overlay_packages/DeviceAsWebcamRaven/res/raw/physical_camera_mapping.json
@@ -0,0 +1 @@
+{"0": {"3" : "UW"}}
\ No newline at end of file