diff options
| author | Roman Kiryanov <rkir@google.com> | 2024-02-24 02:02:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-24 02:02:26 +0000 |
| commit | f7eea89ba03c9f952d89ea3cd6b9d00956014779 (patch) | |
| tree | 862eb8ca856747400affa40e4b60669fb0bd66bb | |
| parent | e7a87e05a6219ee9631ab35173ec0346b092654f (diff) | |
| parent | 7c0386eb08d62bc60787ab317e76f37da05ea532 (diff) | |
| download | goldfish-temp_319669529.tar.gz | |
Merge "Add empty_data_disk to keep data empty" into main am: 7c0386eb08temp_319669529
Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/2974645
Change-Id: Ief310c1e696fa73e2d04e6e32d41eeb8ccf3ce2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | data/empty_data_disk | 3 | ||||
| -rw-r--r-- | product/generic.mk | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/data/empty_data_disk b/data/empty_data_disk new file mode 100644 index 00000000..6ec0828a --- /dev/null +++ b/data/empty_data_disk @@ -0,0 +1,3 @@ +This special file tells the host side to keep the data partition empty. + +See b/326479561 for more details. diff --git a/product/generic.mk b/product/generic.mk index 83a5faec..b1590015 100644 --- a/product/generic.mk +++ b/product/generic.mk @@ -289,6 +289,7 @@ ifneq ($(PRODUCT_IS_ATV_SDK),true) endif PRODUCT_COPY_FILES += \ + device/generic/goldfish/data/empty_data_disk:data/empty_data_disk \ device/generic/goldfish/data/etc/dtb.img:dtb.img \ device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ device/generic/goldfish/emulator-info.txt:data/misc/emulator/version.txt \ |