Merge "Do not pack symbolic link instead copying" am: 67f1a24b87 am: 04e4646dc9 am: 2f2d2d8614

Original change: https://android-review.googlesource.com/c/platform/build/+/1626199

Change-Id: I694927f50383edfaba419efeef31259ffb7214f5
This commit is contained in:
Colin Cross 2021-03-17 16:57:27 +00:00 committed by Automerger Merge Worker
commit 8e3365e911

View file

@ -65,7 +65,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/security
include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE): PRIVATE_CERT := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
$(LOCAL_BUILT_MODULE): $(SOONG_ZIP) $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
$(SOONG_ZIP) -o $@ -j -f $(PRIVATE_CERT)
$(SOONG_ZIP) -o $@ -j -symlinks=false -f $(PRIVATE_CERT)
#######################################
@ -88,5 +88,5 @@ $(LOCAL_BUILT_MODULE): \
$(SOONG_ZIP) \
$(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem \
$(extra_recovery_keys)
$(SOONG_ZIP) -o $@ -j \
$(SOONG_ZIP) -o $@ -j -symlinks=false \
$(foreach key_file, $(PRIVATE_CERT) $(PRIVATE_EXTRA_RECOVERY_KEYS), -f $(key_file))