From e5243fba2af6326ef2ccac6d08f03be96c709f8a Mon Sep 17 00:00:00 2001 From: Wei Li Date: Thu, 25 Apr 2024 11:32:09 -0700 Subject: [PATCH 1/4] Move license metadata declarations to meta-lic.mk and remove the Android.mk file. Bug: 310058310 Test: CIs Change-Id: I7036be4fff910b39cc2aeba4597a6583b29505d3 --- Android.mk | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 Android.mk diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 0a022e9c..00000000 --- a/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# -# Copyright (C) 2011 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. -# - -# WARNING: Everything listed here will be built on ALL platforms, -# including x86, the universal, and the SDK. Modules must be uniquely -# named (liblights.panda), and must build everywhere, or limit themselves -# to only building on ARM if they include assembly. Individual makefiles -# are responsible for having their own logic, for fine-grained control. - -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,fstab.postinstall,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,ueventd.rc,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,hals.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,media_profiles_V1_0.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,media_codecs_performance.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,device_state_configuration.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,task_profiles.json,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,p2p_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) - -$(eval $(call declare-1p-copy-files,device/google/gs101,audio_policy_configuration.xml)) From 1463ce2e3b9ebb9cb587278518d7c0cbf92fcdaf Mon Sep 17 00:00:00 2001 From: Seungah Lim Date: Tue, 26 Mar 2024 08:11:44 +0000 Subject: [PATCH 2/4] [packetrouter] Add oem-iptables-init.sh to artifact path allowed list In order to apply user-defined chain from vendor by using oem-iptables-init.ch, shell script path is added to PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST. Bug: 312772796 Signed-off-by: Seungah Lim (cherry picked from https://partner-android-review.googlesource.com/q/commit:83a119d7b7102319f7cb5d5015c8f01963ee7cf7) Merged-In: If1b57f985284561f537c1124cd60fe91215f5adc Change-Id: If1b57f985284561f537c1124cd60fe91215f5adc (cherry picked from commit fbf009b886cb6391b0833ab147a18c4cf9adda0d) --- telephony/pktrouter.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/telephony/pktrouter.mk b/telephony/pktrouter.mk index dd923b59..7af34224 100644 --- a/telephony/pktrouter.mk +++ b/telephony/pktrouter.mk @@ -1,3 +1,5 @@ PRODUCT_PACKAGES += wfc-pkt-router PRODUCT_PROPERTY_OVERRIDES += vendor.pktrouter=1 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/telephony/pktrouter +PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ + $(TARGET_COPY_OUT_SYSTEM)/bin/oem-iptables-init.sh From e20c4f7f8d4b66f9a70361ab01d11cea8d93a8f4 Mon Sep 17 00:00:00 2001 From: Thomas Girardier Date: Thu, 25 Apr 2024 16:21:17 +0000 Subject: [PATCH 3/4] Revert "[Bluetooth] Disable BT auto on feature" Revert submission 26919210-BTAUTOOFF4389 Reason for revert: Auto On has been approved for 24Q3 Reverted changes: /q/submissionid:26919210-BTAUTOOFF4389 Change-Id: I7e817f7003ba96486791b87a6934dfd845244d17 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 46a301f1..70d42500 100644 --- a/device.mk +++ b/device.mk @@ -826,7 +826,7 @@ endif # Enable Bluetooth AutoOn feature PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.server.automatic_turn_on=false + bluetooth.server.automatic_turn_on=true #VNDK PRODUCT_PACKAGES += \ From ae8801f2a9735995761bba8445d30ce47a154c56 Mon Sep 17 00:00:00 2001 From: Enzo Liao Date: Mon, 18 Mar 2024 22:27:39 +0800 Subject: [PATCH 4/4] Apply common SELinux policies related to ramdumps and coredumps to gs101. Refer: ag/26620507 Bug: 298102808 Design: go/sys-software-logging Test: Manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:98d7af4bf7db86523f85c05f4b5d4bc8dc6dc6a0) Merged-In: Ic465edc3914f2815b3696f7b1c7e3475bcbc2acc Change-Id: Ic465edc3914f2815b3696f7b1c7e3475bcbc2acc --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 4df284d1..184ef6db 100644 --- a/device.mk +++ b/device.mk @@ -16,7 +16,7 @@ include device/google/gs-common/device.mk include device/google/gs-common/gs_watchdogd/watchdog.mk -include device/google/gs-common/ramdump/ramdump.mk +include device/google/gs-common/ramdump_and_coredump/ramdump_and_coredump.mk include device/google/gs-common/soc/soc.mk include device/google/gs-common/soc/freq.mk include device/google/gs-common/modem/modem.mk