diff --git a/device.mk b/device.mk index ede4da0b..e90dcc3d 100644 --- a/device.mk +++ b/device.mk @@ -970,14 +970,32 @@ endif # modem logging binary/configs PRODUCT_PACKAGES += modem_logging_control -# modem logging configs +# PILOT SCENARIOS +PRODUCT_PACKAGES += \ + Pixel_stability.cfg \ + Pixel_stability.nprf + +# Default modem log mask for pixel logger PRODUCT_PACKAGES += \ logging.conf \ default.cfg \ default.nprf \ - default_metrics.xml \ - Pixel_stability.cfg \ - Pixel_stability.nprf + default_metrics.xml + +# Log Masks for logmasklibrary below +# default modem log mask +PRODUCT_PACKAGES += \ + default_modem_log_mask.conf \ + default_modem_log_mask.cfg \ + default_modem_log_mask.nprf \ + default_modem_log_mask.xml + +# Empty modem log mask +PRODUCT_PACKAGES += \ + empty_modem_log_mask.conf \ + empty_modem_log_mask.cfg \ + empty_modem_log_mask.nprf \ + empty_modem_log_mask.xml endif diff --git a/radio/Android.bp b/radio/Android.bp index 54b41efc..e3eb7126 100644 --- a/radio/Android.bp +++ b/radio/Android.bp @@ -24,38 +24,6 @@ package { ], } -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, diff --git a/radio/config/default/Android.bp b/radio/config/default/Android.bp new file mode 100644 index 00000000..0a9d4b05 --- /dev/null +++ b/radio/config/default/Android.bp @@ -0,0 +1,92 @@ +// +// 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/zuma:device_google_zuma_license", + ], +} + +prebuilt_etc { + name: "logging.conf", + vendor: true, + proprietary: true, + src: "logging.conf", + relative_install_path: "modem" +} + +prebuilt_etc { + name: "default.cfg", + vendor: true, + proprietary: true, + src: "default.cfg", + relative_install_path: "modem" +} + +prebuilt_etc { + name: "default.nprf", + vendor: true, + proprietary: true, + src: "default.nprf", + relative_install_path: "modem" +} + +prebuilt_etc { + name: "default_metrics.xml", + vendor: true, + proprietary: true, + src: "default_metrics.xml", + relative_install_path: "modem" +} + +// the mask should also be copied to another folder to be accessible to logmasklibrary + +prebuilt_etc { + name: "default_modem_log_mask.conf", + vendor: true, + proprietary: true, + src: "logging.conf", + relative_install_path: "radio/log_masks/default" +} + +prebuilt_etc { + name: "default_modem_log_mask.cfg", + vendor: true, + proprietary: true, + src: "default.cfg", + relative_install_path: "radio/log_masks/default" +} + +prebuilt_etc { + name: "default_modem_log_mask.nprf", + vendor: true, + proprietary: true, + src: "default.nprf", + relative_install_path: "radio/log_masks/default" +} + +prebuilt_etc { + name: "default_modem_log_mask.xml", + vendor: true, + proprietary: true, + src: "default_metrics.xml", + relative_install_path: "radio/log_masks/default" +} + diff --git a/radio/config/default.cfg b/radio/config/default/default.cfg similarity index 100% rename from radio/config/default.cfg rename to radio/config/default/default.cfg diff --git a/radio/config/default.nprf b/radio/config/default/default.nprf similarity index 100% rename from radio/config/default.nprf rename to radio/config/default/default.nprf diff --git a/radio/config/default_metrics.xml b/radio/config/default/default_metrics.xml similarity index 100% rename from radio/config/default_metrics.xml rename to radio/config/default/default_metrics.xml diff --git a/radio/config/logging.conf b/radio/config/default/logging.conf similarity index 100% rename from radio/config/logging.conf rename to radio/config/default/logging.conf diff --git a/radio/config/empty/Android.bp b/radio/config/empty/Android.bp new file mode 100644 index 00000000..319bc20a --- /dev/null +++ b/radio/config/empty/Android.bp @@ -0,0 +1,57 @@ +// +// 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/zuma:device_google_zuma_license", + ], +} + +prebuilt_etc { + name: "empty_modem_log_mask.conf", + vendor: true, + proprietary: true, + src: "logging.conf", + relative_install_path: "radio/log_masks/empty" +} + +prebuilt_etc { + name: "empty_modem_log_mask.cfg", + vendor: true, + proprietary: true, + src: "empty.cfg", + relative_install_path: "radio/log_masks/empty" +} + +prebuilt_etc { + name: "empty_modem_log_mask.nprf", + vendor: true, + proprietary: true, + src: "empty.nprf", + relative_install_path: "radio/log_masks/empty" +} + +prebuilt_etc { + name: "empty_modem_log_mask.xml", + vendor: true, + proprietary: true, + src: "empty_metrics.xml", + relative_install_path: "radio/log_masks/empty" +} diff --git a/radio/config/empty/empty.cfg b/radio/config/empty/empty.cfg new file mode 100644 index 00000000..58f9cd39 --- /dev/null +++ b/radio/config/empty/empty.cfg @@ -0,0 +1 @@ +default.nprf,default_metrics.xml \ No newline at end of file diff --git a/radio/config/empty/empty.nprf b/radio/config/empty/empty.nprf new file mode 100644 index 00000000..be97f47d Binary files /dev/null and b/radio/config/empty/empty.nprf differ diff --git a/radio/config/empty/empty_metrics.xml b/radio/config/empty/empty_metrics.xml new file mode 100644 index 00000000..4e9e38d2 --- /dev/null +++ b/radio/config/empty/empty_metrics.xml @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/radio/config/empty/logging.conf b/radio/config/empty/logging.conf new file mode 100644 index 00000000..e852dd57 --- /dev/null +++ b/radio/config/empty/logging.conf @@ -0,0 +1 @@ +modem_logging_control START -o /data/vendor/radio/logs/always-on -n 50 -s 50 -m /vendor/etc/modem/default.cfg --enable_exmetric --enable_exmetric_internal \ No newline at end of file