tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Do not pack symbolic link instead copying" am: 67f1a24b87

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

Change-Id: I5729db6e1c27f2825d940cb5998fc12e4b9d9d62
This commit is contained in:
Colin Cross 2021-03-16 18:57:31 +00:00 committed by Automerger Merge Worker
commit 04e4646dc9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/product/security/Android.mk
View file

@ -65,7 +65,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/security
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE): PRIVATE_CERT := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem $(LOCAL_BUILT_MODULE): PRIVATE_CERT := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
$(LOCAL_BUILT_MODULE): $(SOONG_ZIP) $(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) \ $(SOONG_ZIP) \
$(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem \ $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem \
$(extra_recovery_keys) $(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)) $(foreach key_file, $(PRIVATE_CERT) $(PRIVATE_EXTRA_RECOVERY_KEYS), -f $(key_file))