Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 7774d1d..1008bfa 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -43,7 +43,7 @@
# which is the version that we reveal to the end user.
# Update this value when the platform version changes (rather
# than overriding it somewhere else). Can be an arbitrary string.
- PLATFORM_VERSION := N
+ PLATFORM_VERSION := 7.0
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -70,12 +70,12 @@
ifeq "" "$(PLATFORM_VERSION_CODENAME)"
# This is the current development code-name, if the build is not a final
# release build. If this is a final release build, it is simply "REL".
- PLATFORM_VERSION_CODENAME := N
+ PLATFORM_VERSION_CODENAME := REL
# This is all of the development codenames that are active. Should be either
# the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional
# codenames after PLATFORM_VERSION_CODENAME.
- PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME)
+ PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME),N
endif
ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"
@@ -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 := 0
endif
endif
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 91d5d26..009ca52 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -139,7 +139,9 @@
pm.dexopt.ab-ota=speed-profile \
pm.dexopt.nsys-library=speed \
pm.dexopt.shared-apk=speed \
- pm.dexopt.forced-dexopt=speed
+ pm.dexopt.forced-dexopt=speed \
+ pm.dexopt.core-app=speed
+
# Enable boot.oat filtering of compiled classes to reduce boot.oat size. b/28026683
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 11a66eb..ec2fa41 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -129,7 +129,8 @@
pm.dexopt.ab-ota=speed-profile \
pm.dexopt.nsys-library=speed \
pm.dexopt.shared-apk=speed \
- pm.dexopt.forced-dexopt=speed
+ pm.dexopt.forced-dexopt=speed \
+ pm.dexopt.core-app=speed
$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)