Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 8886447 from 32d5984c51 to udc-release

Browse source 
Change-Id: Icaf87875e3037d3fb142e79c3558351eef166d23
This commit is contained in:
Android Build Coastguard Worker 2022-07-30 03:02:51 +00:00
commit 38cdaf1e5b
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
device-common.mk
View file

@ -14,13 +14,17 @@
# limitations under the License. # limitations under the License.
# #
ifneq ($(BOARD_WITHOUT_RADIO),true)
-include vendor/google_devices/gs101/proprietary/telephony/device-vendor.mk -include vendor/google_devices/gs101/proprietary/telephony/device-vendor.mk
endif
include device/google/gs101/device.mk include device/google/gs101/device.mk
include device/google/gs101/tts/voice_packs.mk include device/google/gs101/tts/voice_packs.mk
ifneq ($(BOARD_WITHOUT_RADIO),true)
# Telephony # Telephony
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.telephony.carrierlock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.carrierlock.xml frameworks/native/data/etc/android.hardware.telephony.carrierlock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.carrierlock.xml
endif
# Android Verified Boot # Android Verified Boot
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \

6
device.mk
View file

@ -59,9 +59,11 @@ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.oem_unlock_supported=1 ro.oem_unlock_supported=1
ifneq ($(BOARD_WITHOUT_RADIO),true)
# Include vendor telephony soong namespace # Include vendor telephony soong namespace
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY) vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)
endif
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
#Set IKE logs to verbose for WFC #Set IKE logs to verbose for WFC
@ -891,6 +893,7 @@ PRODUCT_PACKAGES += \
calliope_iva.bin \ calliope_iva.bin \
vts.bin vts.bin
ifneq ($(BOARD_WITHOUT_RADIO),true)
# This will be called only if IMSService is building with source code for dev branches. # This will be called only if IMSService is building with source code for dev branches.
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-ims/device-vendor.mk) $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-ims/device-vendor.mk)
@ -903,6 +906,7 @@ PRODUCT_PACKAGES_DEBUG += \
TestRcsApp TestRcsApp
PRODUCT_PACKAGES += ShannonRcs PRODUCT_PACKAGES += ShannonRcs
endif
# Boot Control HAL # Boot Control HAL
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -1157,8 +1161,10 @@ include hardware/google/pixel/common/pixel-common-device.mk
# Pixel Logger # Pixel Logger
include hardware/google/pixel/PixelLogger/PixelLogger.mk include hardware/google/pixel/PixelLogger/PixelLogger.mk
ifneq ($(BOARD_WITHOUT_RADIO),true)
# Telephony # Telephony
include device/google/gs101/telephony/user.mk include device/google/gs101/telephony/user.mk
endif
# Wifi ext # Wifi ext
include hardware/google/pixel/wifi_ext/device.mk include hardware/google/pixel/wifi_ext/device.mk