diff options
| author | Bowgo Tsai <bowgotsai@google.com> | 2017-03-24 11:32:14 +0000 |
|---|---|---|
| committer | Bowgo Tsai <bowgotsai@google.com> | 2017-03-24 19:42:06 +0800 |
| commit | 0888f417f8cd8fdd04ec8f5d4d5acc993ac1159f (patch) | |
| tree | 2188c34ee65fd071a1076fc1ba2a73b0556aa9c5 /aosp_marlin.mk | |
| parent | b7b7d45f0cef1ebd936e2a74aeb9b62658463f67 (diff) | |
Revert "Revert "Move fstab files to /vendor/etc/.""
This reverts commit d037710937d1c15c2d5c70f06f752799e77eaf60.
The following CL on AOSP can fix the recovery failure.
So revert this revert.
https://android-review.googlesource.com/#/c/357170/
Bug: 35811655
Bug: 36502022
Change-Id: I2b56c5709885a0cce1db18801c9adc3db1c9ebe6
Test: normal boot sailfish, go to Settings > System & tap on
"Factory Data reset"
Test: recovery boot sailfish
Diffstat (limited to 'aosp_marlin.mk')
| -rw-r--r-- | aosp_marlin.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/aosp_marlin.mk b/aosp_marlin.mk index edc959f2..2c7e0614 100644 --- a/aosp_marlin.mk +++ b/aosp_marlin.mk @@ -31,7 +31,7 @@ PRODUCT_MODEL := AOSP on msm8996 PRODUCT_MANUFACTURER := google PRODUCT_RESTRICT_VENDOR_FILES := true -PRODUCT_COPY_FILES += device/google/marlin/fstab.aosp_common:root/fstab.marlin +PRODUCT_COPY_FILES += device/google/marlin/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.marlin $(call inherit-product, device/google/marlin/device-marlin.mk) $(call inherit-product-if-exists, vendor/google_devices/marlin/device-vendor-marlin.mk) |