Merge "Add LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: c11ae6c569 am: 8b0af507d9
am: 5f5c4bccd9
* commit '5f5c4bccd9605534aca1e23da68a52b59390437d':
Add LOCAL_CTS_GTEST_LIST_EXECUTABLE
Change-Id: I2d90ac0a48d10f6a6a344a040cc9327df838c4ed
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 363a0d4..2d37850 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