aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-08-11 07:17:46 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-08-11 07:18:15 +0000
commit5a761a4788094fce69c6cd38609f4cf7b4d85e1f (patch)
tree99fd2fed1610a355bb9c11cfa9ca1546158704db
parent203e429d7119cef13e868deddc72167b3251df68 (diff)
parentf1ad51082c627bf194d369c36c027ecb1173b544 (diff)
downloadbuild-5a761a4788094fce69c6cd38609f4cf7b4d85e1f.tar.gz
Make change and version bump to OPD1.170811.001
Change-Id: I05d7eb76f61663ca298184a2f01b26896259cdd1
-rw-r--r--core/build_id.mk2
-rw-r--r--core/version_defaults.mk2
-rw-r--r--target/product/core_minimal.mk6
3 files changed, 2 insertions, 8 deletions
diff --git a/core/build_id.mk b/core/build_id.mk
index 7a97bff976..a472b10fdd 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=OPD1.170810.002
+export BUILD_ID=OPD1.170811.001
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index e5a352e332..0201b38bb8 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -79,7 +79,7 @@ endif
# When you change PLATFORM_VERSION for a given PLATFORM_SDK_VERSION
# please add that PLATFORM_VERSION to the following text file:
# cts/tests/tests/os/assets/platform_versions.txt
-PLATFORM_VERSION.OPD1 := v8.0.0
+PLATFORM_VERSION.OPD1 := 8.0.0
# These are the current development codenames, if the build is not a final
# release build. If this is a final release build, it is simply "REL".
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index fb5f8d2b5f..9ea9a5a0a6 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -150,11 +150,5 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
frameworks/base/compiled-classes-phone:system/etc/compiled-classes)
-# On userdebug builds, collect more tombstones by default.
-ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
- tombstoned.max_tombstone_count=50
-endif
-
$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)