From 82560b49999e910812e6cbc17908ea8ff8e65fe8 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Thu, 17 Mar 2022 22:04:14 +0000 Subject: [PATCH 1/2] Setup automatic sync with upstream --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000..67a20ad8d5 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,8 @@ +stages: + - update-from-upstream + +include: + - project: 'e/templates' + ref: master + file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml' + -- GitLab From d02de58598c82c48a19695267aefc059df47564c Mon Sep 17 00:00:00 2001 From: Sumit Pundir Date: Thu, 20 Aug 2020 21:54:03 +0530 Subject: [PATCH 2/2] core/Makefile: Update Build Description --- core/sysprop.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/sysprop.mk b/core/sysprop.mk index 5dc0ec1f69..e6473e003e 100644 --- a/core/sysprop.mk +++ b/core/sysprop.mk @@ -197,7 +197,7 @@ BUILD_THUMBPRINT := # # BUILD_ID: detail info; has the same info as the build fingerprint -BUILD_DESC := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(BUILD_NUMBER_FROM_FILE) $(BUILD_VERSION_TAGS) +BUILD_DESC := e_$(TARGET_DEVICE)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(BUILD_NUMBER_FROM_FILE) $(BUILD_VERSION_TAGS) # BUILD_DISPLAY_ID is shown under Settings -> About Phone ifeq ($(TARGET_BUILD_VARIANT),user) -- GitLab