diff options
| author | Rupert Shuttleworth <ruperts@google.com> | 2021-04-07 13:25:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-07 13:25:19 +0000 |
| commit | 185080ab391b53aba77261cd1834466bda804dcf (patch) | |
| tree | 2141c5c86b91c12b3a10d7e4632d1db22546e790 | |
| parent | 3a29a4bb95e95a5ebc787f1f985e5e188905a5a8 (diff) | |
| parent | 90eeff54eaf49c7cc477f882dead82ecfbff8eed (diff) | |
| download | build-185080ab391b53aba77261cd1834466bda804dcf.tar.gz | |
Merge "Mark prop file as writable before writing to it." am: 90eeff54ea
Original change: https://android-review.googlesource.com/c/platform/build/+/1666239
Change-Id: I30c1f86fc03d984f3ec7df4b1b19ebb97a4351a6
| -rw-r--r-- | core/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index 93f942ecb3..fc9f64e2d6 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2524,7 +2524,7 @@ endef $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET): $(INSTALLED_DEBUG_RAMDISK_TARGET) $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_TEST_HARNESS_RAMDISK_FILES) | $(COMPRESSION_COMMAND_DEPS) $(call pretty,"Target test harness ramdisk: $@") - rsync -a $(TEST_HARNESS_RAMDISK_SYNC_DIR)/ $(TEST_HARNESS_RAMDISK_ROOT_DIR) + rsync --chmod=u+w -a $(TEST_HARNESS_RAMDISK_SYNC_DIR)/ $(TEST_HARNESS_RAMDISK_ROOT_DIR) $(call append-test-harness-props,$(ADDITIONAL_TEST_HARNESS_PROPERTIES),$(TEST_HARNESS_PROP_TARGET)) $(MKBOOTFS) -d $(TARGET_OUT) $(TEST_HARNESS_RAMDISK_ROOT_DIR) | $(COMPRESSION_COMMAND) > $@ |