diff options
author | Sam Protsenko | 2019-07-25 18:48:31 -0500 |
---|---|---|
committer | android-build-merger | 2019-07-25 18:48:31 -0500 |
commit | f9c25b4c4dbe9e746cd797137de192200213f031 (patch) | |
tree | 5b7eca56ad192e6fb777ad002dfca39a785cc696 | |
parent | 4e0ea7ff3e39406859abebc94d7ed943d4bde953 (diff) | |
parent | 06f706c6fa95c3385d19814b2526a1237617fc38 (diff) | |
download | device-ti-beagle-x15-f9c25b4c4dbe9e746cd797137de192200213f031.tar.gz device-ti-beagle-x15-f9c25b4c4dbe9e746cd797137de192200213f031.tar.xz device-ti-beagle-x15-f9c25b4c4dbe9e746cd797137de192200213f031.zip |
Fix recovery fstab
am: 06f706c6fa
Change-Id: Ie35f7270b3e53f3aa2fd2d28d896c7fc8ef788bd
-rw-r--r-- | BoardConfig.mk | 2 | ||||
-rw-r--r-- | device.mk | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 804f50c..ad4f857 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk | |||
@@ -52,7 +52,7 @@ TARGET_BOOTLOADER_BOARD_NAME := beagle_x15board | |||
52 | TARGET_BOARD_PLATFORM := am57x | 52 | TARGET_BOARD_PLATFORM := am57x |
53 | TARGET_COPY_OUT_VENDOR := vendor | 53 | TARGET_COPY_OUT_VENDOR := vendor |
54 | 54 | ||
55 | TARGET_RECOVERY_FSTAB = device/ti/beagle_x15/fstab.beagle_x15board | 55 | TARGET_RECOVERY_FSTAB = device/ti/beagle_x15/$(TARGET_FSTAB) |
56 | TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" | 56 | TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" |
57 | TARGET_RELEASETOOLS_EXTENSIONS := device/ti/beagle_x15 | 57 | TARGET_RELEASETOOLS_EXTENSIONS := device/ti/beagle_x15 |
58 | 58 | ||
@@ -113,20 +113,20 @@ PRODUCT_COPY_FILES += \ | |||
113 | PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ | 113 | PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ |
114 | persist.sys.usb.config=mtp \ | 114 | persist.sys.usb.config=mtp \ |
115 | 115 | ||
116 | ifeq ($(KERNEL_MAJ),4) | ||
117 | TARGET_FSTAB := fstab.beagle_x15board_v4 | ||
118 | else | ||
119 | TARGET_FSTAB := fstab.beagle_x15board_v5 | ||
120 | endif | ||
116 | 121 | ||
117 | PRODUCT_COPY_FILES += \ | 122 | PRODUCT_COPY_FILES += \ |
118 | device/ti/beagle_x15/tablet_core_hardware_beagle_x15.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware_beagle_x15.xml \ | 123 | device/ti/beagle_x15/tablet_core_hardware_beagle_x15.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware_beagle_x15.xml \ |
119 | device/ti/beagle_x15/init.beagle_x15board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.beagle_x15board.rc \ | 124 | device/ti/beagle_x15/init.beagle_x15board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.beagle_x15board.rc \ |
120 | device/ti/beagle_x15/init.beagle_x15board.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.beagle_x15board.usb.rc \ | 125 | device/ti/beagle_x15/init.beagle_x15board.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.beagle_x15board.usb.rc \ |
121 | device/ti/beagle_x15/ueventd.beagle_x15board.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ | 126 | device/ti/beagle_x15/ueventd.beagle_x15board.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ |
127 | device/ti/beagle_x15/$(TARGET_FSTAB):$(TARGET_COPY_OUT_VENDOR)/etc/fstab.beagle_x15board \ | ||
122 | frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \ | 128 | frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \ |
123 | 129 | ||
124 | ifeq ($(KERNEL_MAJ),4) | ||
125 | PRODUCT_COPY_FILES += device/ti/beagle_x15/fstab.beagle_x15board_v4:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.beagle_x15board | ||
126 | else | ||
127 | PRODUCT_COPY_FILES += device/ti/beagle_x15/fstab.beagle_x15board_v5:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.beagle_x15board | ||
128 | endif | ||
129 | |||
130 | #FIXME: this feature should be turned off as soon as google start checking for WIFI support before wifi calls | 130 | #FIXME: this feature should be turned off as soon as google start checking for WIFI support before wifi calls |
131 | PRODUCT_COPY_FILES += \ | 131 | PRODUCT_COPY_FILES += \ |
132 | frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ | 132 | frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ |