DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01 am: 0bdac8fba3 am: 2ee84bf0a5 -s ours am: e495d379de -s ours am: 8b961c808b am: 3cba9b15f7 am: 8ebaeae1f6 -s ours am: 9ae8c7356e am: bc60af7bfd am: 37e618fef8 am: c3d3f6bad9 -s ours am: 2af23a3c20
am: 4ace3d2075
* commit '4ace3d207522a81a4ea4ba9fb50a01b7b7a76898':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: If7b75fa6c8e965ecec9bfc7b394408d62eeea5ea
diff --git a/core/Makefile b/core/Makefile
index 39756a3..3ca4e51 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -982,7 +982,7 @@
$(hide) mkdir -p $(TARGET_RECOVERY_OUT)
$(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/sdcard $(TARGET_RECOVERY_ROOT_OUT)/tmp
@echo Copying baseline ramdisk...
- $(hide) rsync -a --exclude=etc --exclude=sdcard $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) # "cp -Rf" fails to overwrite broken symlinks on Mac.
+ $(hide) rsync -a --exclude=etc --exclude=sdcard $(IGNORE_CACHE_LINK) $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) # "cp -Rf" fails to overwrite broken symlinks on Mac.
@echo Modifying ramdisk contents...
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc
$(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/
@@ -1464,6 +1464,9 @@
cacheimage-nodeps: | $(INTERNAL_USERIMAGES_DEPS)
$(build-cacheimage-target)
+else # BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE
+# we need to ignore the broken cache link when doing the rsync
+IGNORE_CACHE_LINK := --exclude=cache
endif # BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 1c1e2ca..161a384 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -91,7 +91,7 @@
# assuming the device can only support APIs as of the previous official
# public release.
# This value will always be 0 for release builds.
- PLATFORM_PREVIEW_SDK_VERSION := 4
+ PLATFORM_PREVIEW_SDK_VERSION := 1
endif
endif