diff --git a/device.mk b/device.mk index 11eaf69..52b406c 100644 --- a/device.mk +++ b/device.mk @@ -987,14 +987,15 @@ PRODUCT_PACKAGES += modem_logging_control PRODUCT_PACKAGES += liboemservice_proxy_default # modem logging configs -PRODUCT_COPY_FILES += \ - device/google/zumapro/radio/config/logging.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/logging.conf \ - device/google/zumapro/radio/config/default.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.cfg \ - device/google/zumapro/radio/config/default.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.nprf \ - device/google/zumapro/radio/config/default_metrics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default_metrics.xml -# modem extensive logging config PRODUCT_PACKAGES += \ + logging.conf \ + default.cfg \ + default.nprf \ + default_metrics.xml \ + Pixel_stability.cfg \ + Pixel_stability.nprf \ extensive_logging.conf + # Vendor modem extensive logging default property PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.modem.extensive_logging_enabled=false diff --git a/radio/Android.bp b/radio/Android.bp new file mode 100644 index 0000000..0657c3a --- /dev/null +++ b/radio/Android.bp @@ -0,0 +1,72 @@ +// +// Copyright (C) 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. + +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "//device/google/zuma:device_google_zuma_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: [ + "//device/google/zumapro:device_google_zumapro_license", + ], +} +prebuilt_etc { + name: "logging.conf", + vendor: true, + proprietary: true, + src: "config/logging.conf", + relative_install_path: "modem" +} + +prebuilt_etc { + name: "default.cfg", + vendor: true, + proprietary: true, + src: "config/default.cfg", + relative_install_path: "modem" +} + +prebuilt_etc { + name: "default.nprf", + vendor: true, + proprietary: true, + src: "config/default.nprf", + relative_install_path: "modem" +} + +prebuilt_etc { + name: "default_metrics.xml", + vendor: true, + proprietary: true, + src: "config/default_metrics.xml", + relative_install_path: "modem" +} + +prebuilt_etc { + name: "Pixel_stability.cfg", + vendor: true, + proprietary: true, + src: "config/Pixel_stability.cfg", + relative_install_path: "modem" +} + +prebuilt_etc { + name: "Pixel_stability.nprf", + vendor: true, + proprietary: true, + src: "config/Pixel_stability.nprf", + relative_install_path: "modem" +} diff --git a/radio/config/Pixel_stability.cfg b/radio/config/Pixel_stability.cfg new file mode 100644 index 0000000..dcc0a63 --- /dev/null +++ b/radio/config/Pixel_stability.cfg @@ -0,0 +1 @@ +Pixel_stability.nprf,default_metrics.xml \ No newline at end of file diff --git a/radio/config/Pixel_stability.nprf b/radio/config/Pixel_stability.nprf new file mode 100644 index 0000000..b8f9e8c Binary files /dev/null and b/radio/config/Pixel_stability.nprf differ diff --git a/radio/config/default.nprf b/radio/config/default.nprf index 528444f..c0715c7 100644 Binary files a/radio/config/default.nprf and b/radio/config/default.nprf differ