merge in nyc-release history after reset to nyc-dev
diff --git a/core/build_id.mk b/core/build_id.mk
index 974dd02..5a012b9 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-export BUILD_ID=NRD48B
+export BUILD_ID=NYC
diff --git a/core/definitions.mk b/core/definitions.mk
index 5d24b67..e2d5de4 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2497,7 +2497,7 @@
# Uncompress shared libraries embedded in an apk.
#
define uncompress-shared-libs
-$(hide) if unzip -l $@ $(PRIVATE_EMBEDDED_JNI_LIBS) >/dev/null ; then \
+$(hide) if (zipinfo $@ $(PRIVATE_EMBEDDED_JNI_LIBS) 2>/dev/null | grep -v ' stor ' >/dev/null) ; then \
rm -rf $(dir $@)uncompressedlibs && mkdir $(dir $@)uncompressedlibs; \
unzip $@ $(PRIVATE_EMBEDDED_JNI_LIBS) -d $(dir $@)uncompressedlibs && \
zip -d $@ 'lib/*.so' && \
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 040377c..7504d01 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -141,5 +141,9 @@
pm.dexopt.shared-apk=speed \
pm.dexopt.forced-dexopt=speed
+# Enable boot.oat filtering of compiled classes to reduce boot.oat size. b/28026683
+PRODUCT_COPY_FILES += \
+ frameworks/base/compiled-classes-phone:system/etc/compiled-classes
+
$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
