From 1e9faa2bc926ed9ee4cb9e6c3cb61a5887ac135e Mon Sep 17 00:00:00 2001
From: Shreshta Manu <shreshtabm@google.com>
Date: Wed, 11 Sep 2024 20:35:01 +0000
Subject: [PATCH] [Ranging] Add ranging to build

Bug: 364930449
Test: compiles
Change-Id: I35af9f96715be1366fba7041b65094e5a8c04eb0
---
 target/product/base_system.mk        | 5 +++++
 target/product/default_art_config.mk | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 5b54051303..ab23397cc4 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -346,6 +346,11 @@ ifeq ($(RELEASE_USE_WEBVIEW_BOOTSTRAP_MODULE),true)
         com.android.webview.bootstrap
 endif
 
+ifneq (,$(RELEASE_RANGING_STACK))
+    PRODUCT_PACKAGES += \
+        com.android.ranging
+endif
+
 # VINTF data for system image
 PRODUCT_PACKAGES += \
     system_manifest.xml \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 1a3f2cf0e8..4c9eda8f8a 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -113,6 +113,12 @@ ifeq ($(RELEASE_PACKAGE_PROFILING_MODULE),true)
 
 endif
 
+ifneq (,$(RELEASE_RANGING_STACK))
+    PRODUCT_APEX_BOOT_JARS += \
+        com.android.uwb:framework-ranging \
+    $(call soong_config_set,bootclasspath,release_ranging_stack,true)
+endif
+
 # List of system_server classpath jars delivered via apex.
 # Keep the list sorted by module names and then library names.
 # Note: For modules available in Q, DO NOT add new entries here.