Merge "Only checks compatibility for VINTF XMLs when PRODUCT_FULL_TREBLE" into oc-dev
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 18ee6be..9340e54 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -104,14 +104,14 @@
# When you increment the PLATFORM_SDK_VERSION please ensure you also
# clear out the following text file of all older PLATFORM_VERSION's:
# cts/tests/tests/os/assets/platform_versions.txt
- PLATFORM_SDK_VERSION := 26
+ PLATFORM_SDK_VERSION := 25
endif
ifndef PLATFORM_JACK_MIN_SDK_VERSION
# This is definition of the min SDK version given to Jack for the current
# platform. For released version it should be the same as
# PLATFORM_SDK_VERSION. During development, this number may be incremented
- # before PLATFORM_SDK_VERSION if the platform starts to add new java
+ # before PLATFORM_SDK_VERSION if the plateform starts to add new java
# language supports.
PLATFORM_JACK_MIN_SDK_VERSION := o-b1
endif
diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index ffdd904..f8f8bda 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -98,8 +98,4 @@
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
pm.dexopt.install=quicken \
pm.dexopt.bg-dexopt=speed-profile \
- pm.dexopt.ab-ota=speed-profile \
- pm.dexopt.nsys-library=speed \
- pm.dexopt.shared-apk=speed \
- pm.dexopt.forced-dexopt=speed \
- pm.dexopt.core-app=speed
+ pm.dexopt.ab-ota=speed-profile