Evolution-x-devices/device_google_redfin
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/device_google_redfin synced 2026-01-27 14:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'android-15.0.0_r1' of https://android.googlesource.com/device/google/redfin into HEAD

Browse Source 
Android 15.0.0 release 1

* tag 'android-15.0.0_r1' of https://android.googlesource.com/device/google/redfin:
  Update stale OWNERS.
  Remove mandyshen@google.com from OWNERS
  Set "enable_nr_dual_connectivity_qcril" to control module build
  Move license metadata declarations to meta-lic.mk and remove the Android.mk file.
  Convert Android.mk to Android.bp under redfin/dumpstate

Change-Id: I1700fa7eb746d0b3c22424642dda916dda0db8ff
This commit is contained in:
Michael Bestas
2024-09-26 00:53:09 +03:00
parent 69332ca055 d31921c35b
commit 4e4c7364c1
6 changed files with 53 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Android.mk
View File

@@ -1,38 +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.
#
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,))
$(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))
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

2
OWNERS
View File

@@ -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

3
device-redfin.mk
View File

@@ -231,3 +231,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)

48
dumpstate/Android.bp Normal file
View File

@@ -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,
}

44
dumpstate/Android.mk
View File

@@ -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)

4
vibrator/OWNERS
View File

@@ -1,3 +1 @@
chasewu@google.com
eliptus@google.com
michaelwr@google.com
file:platform/hardware/google/pixel:/vibrator/OWNERS