From f43a72c59881c511a72264949376280ebfbe7199 Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Fri, 17 Nov 2023 14:00:29 +0800 Subject: [PATCH 1/5] Convert Android.mk to Android.bp under redfin/dumpstate Bug: 311544087 Test: lunch aosp_redfin-trunk_staging-userdebug, m android.hardware.dumpstate@1.1-service.redfin Change-Id: I40e70657f57cda1240594d13bcef79ec0e155a33 --- Android.mk | 7 ------- dumpstate/Android.bp | 48 ++++++++++++++++++++++++++++++++++++++++++++ dumpstate/Android.mk | 44 ---------------------------------------- 3 files changed, 48 insertions(+), 51 deletions(-) create mode 100644 dumpstate/Android.bp delete mode 100644 dumpstate/Android.mk diff --git a/Android.mk b/Android.mk index c7a4e06..55d2d7e 100644 --- a/Android.mk +++ b/Android.mk @@ -14,8 +14,6 @@ # limitations under the License. # -LOCAL_PATH := $(call my-dir) - $(eval $(call declare-copy-files-license-metadata,device/google/redfin,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) $(eval $(call declare-copy-files-license-metadata,device/google/redfin,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) $(eval $(call declare-copy-files-license-metadata,device/google/redfin,fstab.postinstall,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) @@ -31,8 +29,3 @@ $(eval $(call declare-copy-files-license-metadata,device/google/redfin,wpa_suppl $(eval $(call declare-copy-files-license-metadata,device/google/redfin,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) $(eval $(call declare-1p-copy-files,device/google/redfin,audio_policy_configuration.xml)) - -ifeq ($(USES_DEVICE_GOOGLE_REDFIN),true) - subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH)) - $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk))) -endif diff --git a/dumpstate/Android.bp b/dumpstate/Android.bp new file mode 100644 index 0000000..1da1bde --- /dev/null +++ b/dumpstate/Android.bp @@ -0,0 +1,48 @@ +// +// Copyright 2016 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 + default_applicable_licenses: [ + "Android-Apache-2.0", + ], +} + +cc_binary { + name: "android.hardware.dumpstate@1.1-service.redfin", + init_rc: ["android.hardware.dumpstate@1.1-service.redfin.rc"], + relative_install_path: "hw", + + srcs: [ + "DumpstateDevice.cpp", + "service.cpp", + ], + shared_libs: [ + "android.hardware.dumpstate@1.0", + "android.hardware.dumpstate@1.1", + "libbase", + "libcutils", + "libdumpstateutil", + "libhidlbase", + "liblog", + "libutils", + ], + cflags: [ + "-Werror", + "-Wall", + ], + proprietary: true, +} diff --git a/dumpstate/Android.mk b/dumpstate/Android.mk deleted file mode 100644 index e702557..0000000 --- a/dumpstate/Android.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright 2016 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. -# - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.dumpstate@1.1-service.redfin -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_INIT_RC := android.hardware.dumpstate@1.1-service.redfin.rc -LOCAL_MODULE_RELATIVE_PATH := hw - -LOCAL_SRC_FILES := \ - DumpstateDevice.cpp \ - service.cpp - -LOCAL_SHARED_LIBRARIES := \ - android.hardware.dumpstate@1.0 \ - android.hardware.dumpstate@1.1 \ - libbase \ - libcutils \ - libdumpstateutil \ - libhidlbase \ - liblog \ - libutils - -LOCAL_CFLAGS := -Werror -Wall - -LOCAL_MODULE_TAGS := optional -LOCAL_PROPRIETARY_MODULE := true - -include $(BUILD_EXECUTABLE) From e839be5fd478863c8c7107436fb35633089b9cf3 Mon Sep 17 00:00:00 2001 From: Wei Li Date: Tue, 7 May 2024 16:36:51 -0700 Subject: [PATCH 2/5] Move license metadata declarations to meta-lic.mk and remove the Android.mk file. Bug: 311544087 Test: CIs Change-Id: I3521dea829aa2e26072181dc00702cf471ebecf3 --- Android.mk | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 Android.mk diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 55d2d7e..0000000 --- a/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright 2018 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. -# - -$(eval $(call declare-copy-files-license-metadata,device/google/redfin,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/redfin,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/redfin,fstab.postinstall,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/redfin,ueventd.rc,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/redfin,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/redfin,hals.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/redfin,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/redfin,media_codecs_performance.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/redfin,device_state_configuration.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/redfin,task_profiles.json,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/redfin,p2p_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/redfin,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/redfin,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) - -$(eval $(call declare-1p-copy-files,device/google/redfin,audio_policy_configuration.xml)) From 09be3f1607ef6174ceac76cfd28739b91df96040 Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Thu, 6 Jun 2024 14:39:52 +0800 Subject: [PATCH 3/5] Set "enable_nr_dual_connectivity_qcril" to control module build Bug: 331707506 Test: 1. lunch barbet-trunk_staging-eng 2. m PowerManagerNrDualConnectivityQcril 3. m ConnectivityThermalPowerManager_2020_and_older_test Change-Id: If2fb55f111c1a7833673ee5e2e3114b7a3ea59c3 --- device-redfin.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-redfin.mk b/device-redfin.mk index ae4645e..3cb976b 100644 --- a/device-redfin.mk +++ b/device-redfin.mk @@ -250,3 +250,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ NfcOverlayRedfin + +# Set soong config variable to control module build +$(call soong_config_set,ctpm,enable_nr_dual_connectivity_qcril,true) From 5bc2c76ced629ea6f733170f50f4fa9b383a9a28 Mon Sep 17 00:00:00 2001 From: Owner Cleanup Bot Date: Thu, 6 Jun 2024 17:52:18 +0000 Subject: [PATCH 4/5] Remove mandyshen@google.com from OWNERS This suggested change is automatically generated based on group memberships and affiliations. If this change is unnecessary or in error, vote CR -1 and the bot will abandon it. Vote CR +1/2 to approve this change. See the owner's recent activity for context: https://android-review.googlesource.com/q/mandyshen@google.com To report an issue, file a bug in the Infra>Codereview component. Change-Id: I48a400947d4abd3a36779f6fa0761f0508ca2283 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 8d50dff..e53daa6 100644 --- a/OWNERS +++ b/OWNERS @@ -1 +1 @@ -per-file thermal_info_config_redfin.json = tstrudel@google.com,wvw@google.com,joaodias@google.com,paillon@google.com,jychen@google.com,kamewang@google.com,yihocheng@google.com,mandyshen@google.com,davidchao@google.com,jenhaochen@google.com,liumartin@google.com +per-file thermal_info_config_redfin.json = tstrudel@google.com,wvw@google.com,joaodias@google.com,paillon@google.com,jychen@google.com,kamewang@google.com,yihocheng@google.com,davidchao@google.com,jenhaochen@google.com,liumartin@google.com From 55cf39f0126da11476731f90b69537841970f2a8 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Thu, 13 Jun 2024 14:45:54 +0100 Subject: [PATCH 5/5] Update stale OWNERS. None of the people in this OWNERS file work on haptics anymore. Point to a maintained OWNERS file so there's only one place to update when the team changes in the future. Bug: 346876927 Test: N/A Flag: EXEMPT OWNERS change Change-Id: Ia3df4631258f3615057db9f7efe5fa2edd76c6cb --- vibrator/OWNERS | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vibrator/OWNERS b/vibrator/OWNERS index 928c9ff..dec74a8 100644 --- a/vibrator/OWNERS +++ b/vibrator/OWNERS @@ -1,3 +1 @@ -chasewu@google.com -eliptus@google.com -michaelwr@google.com +file:platform/hardware/google/pixel:/vibrator/OWNERS