Skip to content

Commit a90e7af

Browse files
committed
gs201: Fold device makefiles
Change-Id: Ib1387b8c669be8d2f819d8ac8bb71e3fa67c502f
1 parent 693cdfa commit a90e7af

3 files changed

Lines changed: 13 additions & 25 deletions

File tree

device.mk renamed to common.mk

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,10 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
324324
PRODUCT_COPY_FILES += \
325325
device/google/gs201/allowlist_com.google.android.as.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/allowlist_com.google.android.as.xml
326326

327+
# Android Verified Boot
328+
PRODUCT_COPY_FILES += \
329+
frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml
330+
327331
# ANGLE - Almost Native Graphics Layer Engine
328332
PRODUCT_PACKAGES += \
329333
ANGLE
@@ -450,6 +454,12 @@ endif
450454
PRODUCT_PACKAGES += \
451455
sensors.dynamic_sensor_hal
452456

457+
# Telephony
458+
ifneq ($(TARGET_IS_TABLET),true)
459+
PRODUCT_COPY_FILES += \
460+
frameworks/native/data/etc/android.hardware.telephony.carrierlock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.carrierlock.xml
461+
endif
462+
453463
# Touch
454464
include hardware/google/pixel/touch/device.mk
455465

@@ -460,3 +470,6 @@ DEVICE_MATRIX_FILE += \
460470
device/google/gs201/vintf/compatibility_matrix.xml
461471
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += \
462472
device/google/gs201/vintf/device_framework_matrix_product.xml
473+
474+
# ZRAM writeback
475+
include hardware/google/pixel/mm/device_gki.mk

device-common.mk

Lines changed: 0 additions & 19 deletions
This file was deleted.

device-shipping-common.mk

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)