From 1e4a6925d931b4e0251283afaf84811eb82f47db Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Tue, 27 Aug 2024 07:21:40 +0000 Subject: [PATCH 1/5] gps: Re-enable GLO & QZSS in US Change-Id: Ibc607508aeaba14b54876d0ce13ea493e6d76795 Test: on-device Bug: 353579502 --- location/gps.6.1.xml.l10 | 3 +++ location/gps.xml.l10 | 3 +++ location/gps_user.6.1.xml.l10 | 2 ++ location/gps_user.xml.l10 | 2 ++ 4 files changed, 10 insertions(+) diff --git a/location/gps.6.1.xml.l10 b/location/gps.6.1.xml.l10 index 95ee3bf..4a4b847 100644 --- a/location/gps.6.1.xml.l10 +++ b/location/gps.6.1.xml.l10 @@ -57,6 +57,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" @@ -96,6 +97,8 @@ /> diff --git a/location/gps.xml.l10 b/location/gps.xml.l10 index 5e7e291..b4d355c 100644 --- a/location/gps.xml.l10 +++ b/location/gps.xml.l10 @@ -57,6 +57,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" @@ -96,6 +97,8 @@ /> diff --git a/location/gps_user.6.1.xml.l10 b/location/gps_user.6.1.xml.l10 index 0331e0d..27a5a53 100644 --- a/location/gps_user.6.1.xml.l10 +++ b/location/gps_user.6.1.xml.l10 @@ -95,6 +95,8 @@ /> diff --git a/location/gps_user.xml.l10 b/location/gps_user.xml.l10 index 1c4b639..6f62071 100644 --- a/location/gps_user.xml.l10 +++ b/location/gps_user.xml.l10 @@ -95,6 +95,8 @@ /> From 2695d16fe289d0ad864eb526d06a1556208aa1e7 Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 28 Aug 2024 22:54:42 -0700 Subject: [PATCH 2/5] Delete mapper4 manifest Bug: 362183626 Flag: EXEMPT manifest update Test: Boot to home on shiba Change-Id: I2ee823a19315d8bfb079594d83e3a4f818ef504b --- manifest.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/manifest.xml b/manifest.xml index 38a4af5..3fe5807 100644 --- a/manifest.xml +++ b/manifest.xml @@ -48,15 +48,6 @@ default - - android.hardware.graphics.mapper - passthrough - 4.0 - - IMapper - default - - android.hardware.graphics.composer hwbinder From 98621fdd5f03651f7bdfdb2243a7fbd6fb1c2d70 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Wed, 4 Sep 2024 12:05:36 -0700 Subject: [PATCH 3/5] lynx: add etm modules in userdebug/eng builds ETM modules are removed in kernel prebuilts. So add them manually. Bug: 364652655 Bug: 364309766 Test: build lynx Flag: build.RELEASE_ETM_IN_USERDEBUG_ENG Change-Id: I7faa1701445e477a7521e67d5274ccbf30d19fd0 --- device-lynx.mk | 7 +++++++ lynx/BoardConfig.mk | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/device-lynx.mk b/device-lynx.mk index d38fa58..408a4f2 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -342,3 +342,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth device id PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=20491 + +# ETM +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) +endif +endif diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index b3cd8b8..cebad5f 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -43,3 +43,9 @@ include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk include device/google/lynx-sepolicy/lynx-sepolicy.mk include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk + +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/BoardUserdebugModules.mk +endif +endif From de2199aefed85eedd5f005ea8982653af8e0df65 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 5 Sep 2024 08:19:54 +0000 Subject: [PATCH 4/5] Update product id for lynx Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: Iab04bd0b3598a5b2532f0f527a77451db416f0dd --- device-lynx.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 408a4f2..5803dfd 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -340,8 +340,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.quick_start.device_id=lynx # Bluetooth device id +# Raven: 0x410B PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20491 + bluetooth.device_id.product_id=16651 # ETM ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) From ae1689beae84df4760bc2c921a83778e2cc2bee4 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 6 Sep 2024 07:34:33 +0000 Subject: [PATCH 5/5] Symlink current prebuilt folder to android root The Android are now based on Trunk Stable world and Pixel prebuilts CLs also needs to reply with this which controlled by the flag which results: - the flag value might be different on each branches - the flag value are mostly different on each release configuration - for local builds, ENGs' needs to figure out the correct location of current prebuilts by checking through entire prebuilt textproto files To alleviate this problem, create an symlink file under android root indicates current prebuilt path after invoke the android lunch cmd. Bug: 364831620 Flag: EXEMPT export current prebuilt path Change-Id: Ibf76c45b14c9b5064e372f9c3febede823423bef Signed-off-by: Robin Peng --- lynx/BoardConfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index cebad5f..9b10eb1 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -40,6 +40,7 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk include device/google/lynx-sepolicy/lynx-sepolicy.mk include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk