diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk index 0b10a4e..c005922 100644 --- a/aosp_husky_pgagnostic.mk +++ b/aosp_husky_pgagnostic.mk @@ -16,10 +16,11 @@ $(call inherit-product, device/google/shusky/aosp_husky.mk) PRODUCT_NAME := aosp_husky_pgagnostic -PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF +PRODUCT_MODEL := AOSP page-size agnostic Husky 16KB ELF PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true -PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 +PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 +PRODUCT_16K_DEVELOPER_OPTION := true TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk index 9d2434c..91a9992 100644 --- a/aosp_shiba_pgagnostic.mk +++ b/aosp_shiba_pgagnostic.mk @@ -16,10 +16,11 @@ $(call inherit-product, device/google/shusky/aosp_shiba.mk) PRODUCT_NAME := aosp_shiba_pgagnostic -PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF +PRODUCT_MODEL := AOSP page-size agnostic Shiba 16KB ELF PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true -PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 +PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 +PRODUCT_16K_DEVELOPER_OPTION := true TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 diff --git a/device-husky.mk b/device-husky.mk index fbb5e6c..0cf8269 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -232,6 +232,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.leaudio.dual_bidirection_swb.supported=true +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true @@ -456,3 +460,5 @@ PRODUCT_PACKAGES += \ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) endif + +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 6852ee7..ffbceb7 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -183,6 +183,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.leaudio.dual_bidirection_swb.supported=true +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service diff --git a/device-shiba.mk b/device-shiba.mk index e5d6fcd..72b9902 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -219,6 +219,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.leaudio.dual_bidirection_swb.supported=true +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true @@ -424,3 +428,5 @@ PRODUCT_PACKAGES += \ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) endif + +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true diff --git a/factory_husky.mk b/factory_husky.mk index 5c2c0ce..c44fc7e 100644 --- a/factory_husky.mk +++ b/factory_husky.mk @@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Factory binaries of camera PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/factory_ripcurrent.mk b/factory_ripcurrent.mk index b7c64c5..17cf8e8 100644 --- a/factory_ripcurrent.mk +++ b/factory_ripcurrent.mk @@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Factory binaries of camera PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_sb3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/factory_shiba.mk b/factory_shiba.mk index d20f113..2564bfe 100644 --- a/factory_shiba.mk +++ b/factory_shiba.mk @@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Factory binaries of camera PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_sb3_ultrawide_hat_tool factory_hk3sb3_main_cam_decompress_test sb3_ultrawide_af_fw_update + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/husky_generic.mk b/husky_generic.mk index 2bf7caf..61489f4 100644 --- a/husky_generic.mk +++ b/husky_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/shusky/device-husky.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 4592bd7..b944c9c 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -3060,6 +3060,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -3095,6 +3097,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -3130,6 +3134,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -3166,6 +3172,8 @@ "UclampMin_Init": 250, "UclampMin_High": 196, "UclampMin_Low": 196, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0, @@ -3189,6 +3197,8 @@ "UclampMin_Init": 250, "UclampMin_High": 52, "UclampMin_Low": 52, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0, @@ -3212,6 +3222,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0, diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index f7ef01a..f5f1ca1 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -2842,6 +2842,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2875,6 +2877,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2908,6 +2912,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2942,6 +2948,8 @@ "UclampMin_Init": 250, "UclampMin_High": 196, "UclampMin_Low": 196, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -2964,6 +2972,8 @@ "UclampMin_Init": 250, "UclampMin_High": 52, "UclampMin_Low": 52, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -2986,6 +2996,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 4e1e732..c9ca7d2 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -2964,6 +2964,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2999,6 +3001,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -3034,6 +3038,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -3070,6 +3076,8 @@ "UclampMin_Init": 250, "UclampMin_High": 196, "UclampMin_Low": 196, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0, @@ -3093,6 +3101,8 @@ "UclampMin_Init": 250, "UclampMin_High": 52, "UclampMin_Low": 52, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0, @@ -3116,6 +3126,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0, diff --git a/ripcurrent_generic.mk b/ripcurrent_generic.mk index bb1afb3..3789f83 100644 --- a/ripcurrent_generic.mk +++ b/ripcurrent_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/shusky/device-ripcurrent.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common diff --git a/shiba_generic.mk b/shiba_generic.mk index 064301e..f08b683 100644 --- a/shiba_generic.mk +++ b/shiba_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/shusky/device-shiba.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common