Merge "Move Uwb make rules from product/generic.mk to product/uwb.mk" into main
diff --git a/64bitonly/product/sdk_phone64_arm64_uwb.mk b/64bitonly/product/sdk_phone64_arm64_uwb.mk
index 0cf322f..ff62c0f 100644
--- a/64bitonly/product/sdk_phone64_arm64_uwb.mk
+++ b/64bitonly/product/sdk_phone64_arm64_uwb.mk
@@ -18,6 +18,7 @@
device/generic/goldfish/data/etc/advancedFeatures.ini.uwb:advancedFeatures.ini \
$(call inherit-product, device/generic/goldfish/64bitonly/product/sdk_phone64_arm64.mk)
+$(call inherit-product, device/generic/goldfish/product/uwb.mk)
PRODUCT_BRAND := Android
PRODUCT_NAME := sdk_phone64_arm64_uwb
diff --git a/64bitonly/product/sdk_phone64_x86_64_uwb.mk b/64bitonly/product/sdk_phone64_x86_64_uwb.mk
index 6a4ccc9..622ca0a 100644
--- a/64bitonly/product/sdk_phone64_x86_64_uwb.mk
+++ b/64bitonly/product/sdk_phone64_x86_64_uwb.mk
@@ -18,6 +18,7 @@
device/generic/goldfish/data/etc/advancedFeatures.ini.uwb:advancedFeatures.ini \
$(call inherit-product, device/generic/goldfish/64bitonly/product/sdk_phone64_x86_64.mk)
+$(call inherit-product, device/generic/goldfish/product/uwb.mk)
PRODUCT_BRAND := Android
PRODUCT_NAME := sdk_phone64_x86_64_uwb
diff --git a/product/generic.mk b/product/generic.mk
index 6aaea3d..fa1c689 100644
--- a/product/generic.mk
+++ b/product/generic.mk
@@ -155,15 +155,6 @@
TARGET_PRODUCT_PROP := $(LOCAL_PATH)/bluetooth.prop
endif
-# Experimental Feature (Uwb | b/237088064)
-ifneq ($(filter %_uwb, $(TARGET_PRODUCT)),)
- PRODUCT_PACKAGES += \
- com.android.hardware.uwb \
- android.hardware.uwb-service \
- UwbOverlay
- PRODUCT_VENDOR_PROPERTIES += ro.vendor.uwb.dev=/dev/hvc2
-endif
-
PRODUCT_PACKAGES += \
android.hardware.security.keymint-service
PRODUCT_COPY_FILES += \
@@ -368,11 +359,5 @@
endif
endif
-# Experimental Feature (Uwb | b/237088064)
-ifneq ($(filter %_uwb, $(TARGET_PRODUCT)),)
- PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.hardware.uwb.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.uwb.xml
-endif
-
# Goldfish uses 6.X kernels.
PRODUCT_ENABLE_UFFD_GC := true
diff --git a/product/uwb.mk b/product/uwb.mk
new file mode 100644
index 0000000..79967dd
--- /dev/null
+++ b/product/uwb.mk
@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2024 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+PRODUCT_PACKAGES += \
+ com.android.hardware.uwb \
+ android.hardware.uwb-service \
+ UwbOverlay
+PRODUCT_VENDOR_PROPERTIES += ro.vendor.uwb.dev=/dev/hvc2
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.uwb.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.uwb.xml
\ No newline at end of file