From 6b5dd60f5ad45bba42c58b723cbc66035c00fb76 Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Wed, 13 Dec 2023 09:51:11 -0800 Subject: [PATCH 1/3] uwb: add dck capability Bug: 268413427 Change-Id: I5db7cfeaf1de23aae4565a4a87c546c785a275de --- device-ripcurrent.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 31f2212..fd80eb9 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -99,7 +99,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=3 + ro.gms.dck.eligible_wcc=3 \ + ro.gms.dck.se_capability=1 # Bluetooth hci_inject test tool PRODUCT_PACKAGES_DEBUG += \ From 425b1d9864fe1a587bbfd33934b806168aa7f161 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Fri, 15 Dec 2023 14:37:38 -0800 Subject: [PATCH 2/3] 16k: shusky: Rename PRODUCT_PAGE_SIZE_AGNOSTIC Rename PRODUCT_PAGE_SIZE_AGNOSTIC to PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO. When the PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO build flag is true, the bionic's macro PAGE_SIZE will be removed. The function getauxval(AT_PAGESZ) will be used to get the page size instead. Bug: 312541564 Bug: 308663811 Test: Built target Change-Id: I759223f873ada237abd70def7d38c2da73c046bb --- aosp_husky_61_pgagnostic.mk | 2 +- aosp_husky_pgagnostic.mk | 2 +- aosp_shiba_61_pgagnostic.mk | 2 +- aosp_shiba_pgagnostic.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aosp_husky_61_pgagnostic.mk b/aosp_husky_61_pgagnostic.mk index 5687be9..09c8e85 100644 --- a/aosp_husky_61_pgagnostic.mk +++ b/aosp_husky_61_pgagnostic.mk @@ -18,5 +18,5 @@ $(call inherit-product, device/google/pixel_61/aosp_husky_61.mk) PRODUCT_NAME := aosp_husky_61_pgagnostic PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF -PRODUCT_PAGE_SIZE_AGNOSTIC := true +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk index 81219c7..96803f5 100644 --- a/aosp_husky_pgagnostic.mk +++ b/aosp_husky_pgagnostic.mk @@ -18,5 +18,5 @@ $(call inherit-product, device/google/shusky/aosp_husky.mk) PRODUCT_NAME := aosp_husky_pgagnostic PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF -PRODUCT_PAGE_SIZE_AGNOSTIC := true +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 diff --git a/aosp_shiba_61_pgagnostic.mk b/aosp_shiba_61_pgagnostic.mk index adf61d0..79a5b29 100644 --- a/aosp_shiba_61_pgagnostic.mk +++ b/aosp_shiba_61_pgagnostic.mk @@ -18,5 +18,5 @@ $(call inherit-product, device/google/pixel_61/aosp_shiba_61.mk) PRODUCT_NAME := aosp_shiba_61_pgagnostic PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF -PRODUCT_PAGE_SIZE_AGNOSTIC := true +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk index 390d07c..8351681 100644 --- a/aosp_shiba_pgagnostic.mk +++ b/aosp_shiba_pgagnostic.mk @@ -18,5 +18,5 @@ $(call inherit-product, device/google/shusky/aosp_shiba.mk) PRODUCT_NAME := aosp_shiba_pgagnostic PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF -PRODUCT_PAGE_SIZE_AGNOSTIC := true +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 From c20467a3def9b45bd36e428b3e990a5a2e789b10 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Fri, 15 Dec 2023 17:27:46 -0800 Subject: [PATCH 3/3] 16k: Add aosp shusky page agnostic targets Bug: 308663811 Test: source build/envsetup.sh lunch aosp_husky_pgagnostic-trunk-userdebug m Merged-In: I759223f873ada237abd70def7d38c2da73c046bb Merged-In: Idf85cb903cdf2e11df595b495f0313603bc54ead Change-Id: I7415f8bc96b6b5aad8f2ca26b1eb5b053fb786d7 --- AndroidProducts.mk | 2 ++ aosp_husky_pgagnostic.mk | 22 ++++++++++++++++++++++ aosp_shiba_pgagnostic.mk | 22 ++++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 aosp_husky_pgagnostic.mk create mode 100644 aosp_shiba_pgagnostic.mk diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 12e77fc..4e79d41 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -20,9 +20,11 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/factory_ripcurrent.mk \ $(LOCAL_DIR)/aosp_husky.mk \ $(LOCAL_DIR)/aosp_husky_fullmte.mk \ + $(LOCAL_DIR)/aosp_husky_pgagnostic.mk \ $(LOCAL_DIR)/factory_husky.mk \ $(LOCAL_DIR)/aosp_shiba.mk \ $(LOCAL_DIR)/aosp_shiba_fullmte.mk \ + $(LOCAL_DIR)/aosp_shiba_pgagnostic.mk \ $(LOCAL_DIR)/factory_shiba.mk COMMON_LUNCH_CHOICES := \ diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk new file mode 100644 index 0000000..96803f5 --- /dev/null +++ b/aosp_husky_pgagnostic.mk @@ -0,0 +1,22 @@ +# +# Copyright 2023 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. +# +$(call inherit-product, device/google/shusky/aosp_husky.mk) + +PRODUCT_NAME := aosp_husky_pgagnostic +PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF + +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true +PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk new file mode 100644 index 0000000..8351681 --- /dev/null +++ b/aosp_shiba_pgagnostic.mk @@ -0,0 +1,22 @@ +# +# Copyright 2023 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. +# +$(call inherit-product, device/google/shusky/aosp_shiba.mk) + +PRODUCT_NAME := aosp_shiba_pgagnostic +PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF + +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true +PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536