From b1e23943cebd4dc6ccf7314d717ed2715b95171c Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 28 Mar 2023 14:58:12 +0900 Subject: Add hardware/qcom/wlan namespace With libwifi-hal-qcom migrated to Android.bp with soong namespace the namespace should be added to PRODUCT_SOONG_NAMESPACES as well. Bug: 273376293 Test: m droid Change-Id: I98ad7011b602947a708d507453f5725ee19448ec --- device-bramble.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-bramble.mk b/device-bramble.mk index 8d74f1e..bbf0368 100644 --- a/device-bramble.mk +++ b/device-bramble.mk @@ -36,7 +36,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/compression_wit LOCAL_PATH := device/google/bramble PRODUCT_SOONG_NAMESPACES += \ - device/google/bramble + device/google/bramble \ + hardware/qcom/wlan/legacy DEVICE_PACKAGE_OVERLAYS += device/google/bramble/bramble/overlay -- cgit v1.2.3 From d022a4ec6883d4a1ba2b3205edb3cdaefbeb2c9e Mon Sep 17 00:00:00 2001 From: Roy Luo Date: Thu, 21 Sep 2023 20:40:23 +0000 Subject: usb: upgrade stats AIDL to v2 Upgrade stats AIDL to v2 following pixelstats lib. Bug: 297224564 Test: Build Change-Id: Id3c872b48baa1c03b76e6647aeb115cb647dc707 --- usb/usb/Android.bp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp index 1c5d151..df850ee 100644 --- a/usb/usb/Android.bp +++ b/usb/usb/Android.bp @@ -38,7 +38,7 @@ cc_binary { "android.hardware.usb.gadget@1.0", "android.hardware.usb-V1-ndk", "libcutils", - "android.frameworks.stats-V1-ndk", + "android.frameworks.stats-V2-ndk", "pixelatoms-cpp", "libbinder_ndk", @@ -48,7 +48,7 @@ cc_binary { "libpixelstats", ], export_shared_lib_headers: [ - "android.frameworks.stats-V1-ndk", + "android.frameworks.stats-V2-ndk", "pixelatoms-cpp", ], } -- cgit v1.2.3 From 376afa3cd8ee16dd15f597dbe4de6fea297ab6ad Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Wed, 25 Oct 2023 16:15:16 -0600 Subject: Fix lunch choices for git_main We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446 Test: lunch Change-Id: Ide29a6e31d1a07d7d395919cabee997dc3520ffc --- AndroidProducts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 44813d7..4087c6c 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -20,4 +20,4 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_bramble_hwasan.mk \ COMMON_LUNCH_CHOICES := \ - aosp_bramble-userdebug \ + aosp_bramble-trunk_staging-userdebug \ -- cgit v1.2.3 From a051507e0a9664f3c4c9a6066741638f8177dbe5 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 19:04:23 +0000 Subject: Revert "bramble(nfc): Modify NFC overlays for NFC apex" Revert submission 2802548-nfc_apex Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:2802548-nfc_apex Bug: 309117462 Test: Compiles, device boots up (cherry picked from https://android-review.googlesource.com/q/commit:b97bdf43dc0b47dd16798c42ffc7fe4dd5b76417) Merged-In: I12d48913d0334f6eb76061277274c80677ee3324 Change-Id: I12d48913d0334f6eb76061277274c80677ee3324 --- .../packages/apps/Nfc/res/values/config.xml | 38 ++++++++++++++++++++++ bramble/rro_overlays/NfcOverlay/Android.bp | 9 ----- .../rro_overlays/NfcOverlay/AndroidManifest.xml | 27 --------------- bramble/rro_overlays/NfcOverlay/OWNERS | 2 -- .../rro_overlays/NfcOverlay/res/values/config.xml | 38 ---------------------- device-bramble.mk | 3 -- 6 files changed, 38 insertions(+), 79 deletions(-) create mode 100644 bramble/overlay/packages/apps/Nfc/res/values/config.xml delete mode 100644 bramble/rro_overlays/NfcOverlay/Android.bp delete mode 100644 bramble/rro_overlays/NfcOverlay/AndroidManifest.xml delete mode 100644 bramble/rro_overlays/NfcOverlay/OWNERS delete mode 100644 bramble/rro_overlays/NfcOverlay/res/values/config.xml diff --git a/bramble/overlay/packages/apps/Nfc/res/values/config.xml b/bramble/overlay/packages/apps/Nfc/res/values/config.xml new file mode 100644 index 0000000..fe16e58 --- /dev/null +++ b/bramble/overlay/packages/apps/Nfc/res/values/config.xml @@ -0,0 +1,38 @@ + + + + false + 10 + 2000 + https://support.google.com/pixelphone?p=nfc_tag_notification + + G025E + G025I + G025H + G6QU3 + + true + + 70 + 150 + false + + 39 + + + 87 + + diff --git a/bramble/rro_overlays/NfcOverlay/Android.bp b/bramble/rro_overlays/NfcOverlay/Android.bp deleted file mode 100644 index 24d1c23..0000000 --- a/bramble/rro_overlays/NfcOverlay/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -package { - default_applicable_licenses: ["device_google_bramble_license"], -} - -runtime_resource_overlay { - name: "NfcOverlayBramble", - sdk_version: "current", - product_specific: true -} diff --git a/bramble/rro_overlays/NfcOverlay/AndroidManifest.xml b/bramble/rro_overlays/NfcOverlay/AndroidManifest.xml deleted file mode 100644 index 5241aa4..0000000 --- a/bramble/rro_overlays/NfcOverlay/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - diff --git a/bramble/rro_overlays/NfcOverlay/OWNERS b/bramble/rro_overlays/NfcOverlay/OWNERS deleted file mode 100644 index 35e9713..0000000 --- a/bramble/rro_overlays/NfcOverlay/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 48448 -include platform/packages/apps/Nfc:/OWNERS diff --git a/bramble/rro_overlays/NfcOverlay/res/values/config.xml b/bramble/rro_overlays/NfcOverlay/res/values/config.xml deleted file mode 100644 index fe16e58..0000000 --- a/bramble/rro_overlays/NfcOverlay/res/values/config.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - false - 10 - 2000 - https://support.google.com/pixelphone?p=nfc_tag_notification - - G025E - G025I - G025H - G6QU3 - - true - - 70 - 150 - false - - 39 - - - 87 - - diff --git a/device-bramble.mk b/device-bramble.mk index a3bf089..bbf0368 100644 --- a/device-bramble.mk +++ b/device-bramble.mk @@ -208,6 +208,3 @@ PRODUCT_PACKAGES += \ # Workaround for Qualcomm neural network HAL PRODUCT_PACKAGES += \ libprotobuf-cpp-full-3.9.1-vendorcompat - -PRODUCT_PACKAGES += \ - NfcOverlayBramble -- cgit v1.2.3 From 856c3d6d4d00e4f187bfbb6e3091651757e952a3 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: Revert^2 "bramble(nfc): Modify NFC overlays for NFC apex" a051507e0a9664f3c4c9a6066741638f8177dbe5 Bug: 303286040 Test: Compiles Change-Id: Idfacfa312a7c19a5472301cc0cae4b2276ce28df --- bramble/rro_overlays/NfcOverlay/Android.bp | 9 +++++ .../rro_overlays/NfcOverlay/AndroidManifest.xml | 27 +++++++++++++++ bramble/rro_overlays/NfcOverlay/OWNERS | 2 ++ .../rro_overlays/NfcOverlay/res/values/config.xml | 38 ++++++++++++++++++++++ device-bramble.mk | 3 ++ 5 files changed, 79 insertions(+) create mode 100644 bramble/rro_overlays/NfcOverlay/Android.bp create mode 100644 bramble/rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 bramble/rro_overlays/NfcOverlay/OWNERS create mode 100644 bramble/rro_overlays/NfcOverlay/res/values/config.xml diff --git a/bramble/rro_overlays/NfcOverlay/Android.bp b/bramble/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..24d1c23 --- /dev/null +++ b/bramble/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_bramble_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayBramble", + sdk_version: "current", + product_specific: true +} diff --git a/bramble/rro_overlays/NfcOverlay/AndroidManifest.xml b/bramble/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/bramble/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/bramble/rro_overlays/NfcOverlay/OWNERS b/bramble/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/bramble/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/bramble/rro_overlays/NfcOverlay/res/values/config.xml b/bramble/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..fe16e58 --- /dev/null +++ b/bramble/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,38 @@ + + + + false + 10 + 2000 + https://support.google.com/pixelphone?p=nfc_tag_notification + + G025E + G025I + G025H + G6QU3 + + true + + 70 + 150 + false + + 39 + + + 87 + + diff --git a/device-bramble.mk b/device-bramble.mk index bbf0368..a3bf089 100644 --- a/device-bramble.mk +++ b/device-bramble.mk @@ -208,3 +208,6 @@ PRODUCT_PACKAGES += \ # Workaround for Qualcomm neural network HAL PRODUCT_PACKAGES += \ libprotobuf-cpp-full-3.9.1-vendorcompat + +PRODUCT_PACKAGES += \ + NfcOverlayBramble -- cgit v1.2.3