diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-24 06:12:29 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-24 06:12:55 +0000 |
| commit | f1ac0e2917f9d67885694db7224b3d5b5b536acc (patch) | |
| tree | 2665d5c29ef81dc79a6477d9c87f85ff3c461b3e | |
| parent | 3905423c5f6e6bac1b1d7dac921750377f354a8f (diff) | |
| parent | 5129a6f13f0eb16ec872d19845c986654a11316c (diff) | |
| download | build-f1ac0e2917f9d67885694db7224b3d5b5b536acc.tar.gz | |
Make change and version bump to OPM1.171019.004
Change-Id: I4047ea99a0d1ec9eb3698d2ca09b2e9f7a46d4c5
| -rw-r--r-- | core/Makefile | 7 | ||||
| -rw-r--r-- | core/build_id.mk | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index cc16497a9d..618e98317b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -336,7 +336,11 @@ endif $(INSTALLED_BUILD_PROP_TARGET): $(intermediate_system_build_prop) $(INSTALLED_RECOVERYIMAGE_TARGET) @echo "Target build info: $@" +ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE + $(hide) grep -v 'ro.product.first_api_level' $(intermediate_system_build_prop) > $@ +else $(hide) cat $(intermediate_system_build_prop) > $@ +endif ifdef INSTALLED_RECOVERYIMAGE_TARGET $(hide) echo ro.expect.recovery_id=`cat $(RECOVERYIMAGE_ID_FILE)` >> $@ endif @@ -356,10 +360,11 @@ FINAL_VENDOR_BUILD_PROPERTIES := $(call uniq-pairs-by-first-component, \ $(FINAL_VENDOR_BUILD_PROPERTIES),=) endif # property_overrides_split_enabled -$(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(VENDOR_BUILDINFO_SH) +$(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(VENDOR_BUILDINFO_SH) $(intermediate_system_build_prop) @echo Target vendor buildinfo: $@ @mkdir -p $(dir $@) $(hide) echo > $@ + $(hide) grep 'ro.product.first_api_level' $(intermediate_system_build_prop) >> $@ || true $(hide) echo ro.vendor.build.date=`$(DATE_FROM_FILE)`>>$@ $(hide) echo ro.vendor.build.date.utc=`$(DATE_FROM_FILE) +%s`>>$@ $(hide) echo ro.vendor.build.fingerprint="$(BUILD_FINGERPRINT_FROM_FILE)">>$@ diff --git a/core/build_id.mk b/core/build_id.mk index 960dab6312..08a388487d 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=OPM1.171019.003 +export BUILD_ID=OPM1.171019.004 |