diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-05-27 20:49:27 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-05-27 20:49:27 +0000 |
| commit | a97e7d53194decd096f99dc45440ad94cd0677e0 (patch) | |
| tree | fefe29662a31bfb37f8c87c40e0aa28c21b73a8f | |
| parent | ba39d9517d0dfb5593a5c6fb1dff8c6755b00783 (diff) | |
| parent | 7e64ea31a503a71bc9bc8107ddc089a839265a92 (diff) | |
Snap for 6533464 from 7e64ea31a503a71bc9bc8107ddc089a839265a92 to sdk-releaseplatform-tools-30.0.3platform-tools-30.0.2
Change-Id: Idb2ecc37608dbf137481b12971e6b7bff783af9e
| -rw-r--r-- | METADATA | 3 | ||||
| -rw-r--r-- | db845c/BoardConfig.mk | 3 | ||||
| -rw-r--r-- | pixel3_mainline/device.mk | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/METADATA b/METADATA new file mode 100644 index 0000000..d97975c --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} diff --git a/db845c/BoardConfig.mk b/db845c/BoardConfig.mk index 816c465..20ca782 100644 --- a/db845c/BoardConfig.mk +++ b/db845c/BoardConfig.mk @@ -13,6 +13,9 @@ BOARD_KERNEL_PAGESIZE := 2048 BOARD_KERNEL_CMDLINE := earlycon firmware_class.path=/vendor/firmware/ androidboot.hardware=db845c BOARD_KERNEL_CMDLINE += init=/init androidboot.boot_devices=soc@0/1d84000.ufshc printk.devkmsg=on BOARD_KERNEL_CMDLINE += deferred_probe_timeout=30 +# fw_devlink=on, https://android-review.googlesource.com/c/1305327, broke android-mainline +# Set fw_devlink=permissive for the time being +BOARD_KERNEL_CMDLINE += fw_devlink=permissive # Image Configuration BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 #64M diff --git a/pixel3_mainline/device.mk b/pixel3_mainline/device.mk index a6d53f0..1365df7 100644 --- a/pixel3_mainline/device.mk +++ b/pixel3_mainline/device.mk @@ -20,8 +20,7 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk) PRODUCT_COPY_FILES := \ device/linaro/dragonboard/fstab.ramdisk.common:$(TARGET_COPY_OUT_RAMDISK)/fstab.pixel3_mainline \ - device/linaro/dragonboard/fstab.ramdisk.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.pixel3_mainline \ - device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/init/fstab.pixel3_mainline \ + device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.pixel3_mainline \ device/linaro/dragonboard/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.pixel3_mainline.rc \ device/linaro/dragonboard/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.pixel3_mainline.usb.rc \ device/linaro/dragonboard/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/pixel3_mainline.kl |