p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make qt-qpr1-dev-plus-aosp use AOSP.MASTER as BUILD_ID. 

In ag/7020561, after branching of qt-dev, the BUILD_ID was changed to
"QT" and the change was tagged as "DO NOT MERGE" to prevent it flowing
into master.  However, because the -plus-aosp branches was using the
same API level and "DO NOT MERGE" will not be respected there, it would
eventually be merged to stage-aosp-master and promoted to AOSP master.

Address this by using AOSP.MASTER which will cause a merge conflict when
the merge happens.

Bug: 145935472
Change-Id: Iaa17a2c29f1f3cf28f28761a18b0d480b0253fac
Merged-In: I5c28225d61996cb719ae384d7b0828776e84f8d5
This commit is contained in:
Xin Li 2019-12-09 13:28:32 -08:00
parent 69a527d108
commit ef88d9cd99
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/build_id.mk
View File

@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
BUILD_ID=QQ1A.191003.001
BUILD_ID=AOSP.MASTER