Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 am: 2d75d4447c am: 3ffee87b5c am: f8a869d5d8
am: c531f9eea7
* commit 'c531f9eea7329d5a992324eb4e07f0881b9be05a':
Updating security string to 2016-07-01
Change-Id: Iedd9552d375ff14f1aea89c9d3da2e8a3575ab1c
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