aboutsummaryrefslogtreecommitdiff
path: root/version.mk
AgeCommit message (Collapse)Author
2019-01-02Replace USER with BUILD_USERNAMEandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseDan Willemsen
USER may be "nobody" if the build is sandboxed. BUILD_USERNAME will have the original value in all cases. Bug: 122270019 Test: none Change-Id: Ic64f842864a9e79ea2179228370bb4fd92541d20
2018-10-20Restore "Use HAS_BUILD_NUMBER to check engineering build"Nan Zhang
And use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER to reduce build reruns. This was reverted in 6a2a9219b9ea3a2a9b56acd7038c9819f8959c35 Test: m -j32 Bug: b/70351683 Change-Id: I4ac6e62c716c05b103db3a3e09ec288a46149b18 Original-Change-Id: If5eb8891920ddd0486e263dd996f21efd36677c0
2018-02-26Handle click and row updated/added/removed in DVR historyshubang
PiperOrigin-RevId: 186532869 Change-Id: Ida96e009a631ce737b02cf4bf52fe2c8065a2d65
2018-02-22Use HAS_BUILD_NUMBER to check engineering build am: 9d03eaf85c am: 83c538af11Nan Zhang
am: 6d35e804a6 Change-Id: I55998a189e2e95a5d3b928c3cc7d9849082a3937
2018-02-21Use HAS_BUILD_NUMBER to check engineering buildandroid-p-preview-1android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Nan Zhang
And use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER to reduce build reruns. Test: m -j32 Bug: b/70351683 Change-Id: If5eb8891920ddd0486e263dd996f21efd36677c0
2018-01-18Sync aosp code with internal version.Live Channels Team
Project import generated by Copybara. PiperOrigin-RevId: 182265045 Change-Id: I32cd1a70947fd245f8f70c19eb1713943c7af0bc
2018-01-17Fix broken buildNick Chalko
This reverts c9889d1 Update aosp build to use a snapshot of exoplyer. by nchalko · 5 hours ago master 8952aa7 Clean format by nchalko · 20 hours ago ba3fb16 Merge "Use a snapshot of exoplayer" by TreeHugger Robot · 18 hours ago ff75e39 Project import generated by Copybara. by Live Channels Team · 22 hours ago 9737fc2 Use a snapshot of exoplayer by Nick Chalko · 20 hours ago 4a5144a Project import generated by Copybara. by Live Channels Team · 6 days ago Bug: 72092981 Bug: 69474774 Change-Id: Ie756857c10bf052c60b6442c3d61252f65b49143
2018-01-16Project import generated by Copybara.Live Channels Team
PiperOrigin-RevId: 181700159 Change-Id: I7bae213f26b690c0d76189c08abd85d7f7b304a3
2017-10-31Sync to match Live Channels 1.15(ncis)Nick Chalko
aka ub-tv-dev at a73a150bb7d0d1ce867ef980c6ac8411899d40ad Test: build with support-27.0-dev branch merge Bug: 68345297 Bug: 64021596 Change-Id: I7c544fd15e2c58784f8babc31877ad0dfeebb4c0 (cherry picked from commit 633eb826b8c97731dfc5ef12c7bf78a63734275d)
2017-10-03Sync to match Live Channels 1.15(ncis)Nick Chalko
aka ub-tv-dev at a73a150bb7d0d1ce867ef980c6ac8411899d40ad Bug: 64021596 Change-Id: I7c544fd15e2c58784f8babc31877ad0dfeebb4c0
2017-05-05Revert "Sync to ub-tv-dev at f0024d79653da8c8999a91f995431a645a6ff4a2"Adrian Roos
This reverts commit 3dfa929b24f38ac7836450176d88ceab41dc6ac5. Change-Id: I1c76f626d966b8d4793a19677a8840ed0424d3a7
2017-05-05Sync to ub-tv-dev at f0024d79653da8c8999a91f995431a645a6ff4a2Nick Chalko
Change-Id: I4199ec04cacb4a78be58b85302a39d917658dc28
2016-10-31Sync to ub-tv-killing at 6f6e46557accb62c9548e4177d6005aa944dbf33Nick Chalko
Change-Id: I873644d6d9d0110c981ef6075cb4019c16bbb94b
2016-09-17Don't add BUILD_NUMBER to version for platform builds am: 04bf2c2a3e am: ↵Dan Willemsen
cfaee0edf0 am: b15401fe28 am: 7bdf9eb64d Change-Id: Ib0ed96dddba088df2f5b020f09b4b3d36914fbb6
2016-09-16Don't add BUILD_NUMBER to version for platform buildsDan Willemsen
We're removing differences between two builds that have the same source. These builds will have different BUILD_NUMBERs though, so it shouldn't be embedded in the binary. For eng builds, using the current date forces the APK to be rebuilt every time the makefiles are read. Remove this for platform builds, but keep it if building unbundled. Bug: 24201956 Test: Inspect ninja file for changes between two runs Change-Id: Ib42efb54ae6c6859389eb5e81b6a6f337696d049
2016-09-07Sync to ub-tv-dev at http://ag/1415258Nick Chalko
Bug: 30970843 Change-Id: I0aa43094d103de28956a3d9b56a594ea46a20543
2016-05-17DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4Youngsang Cho
Bug: 28469968 Change-Id: I74e368f5f58b433755932b806a90178e37bea7f9
2016-05-11DO NOT MERGE Revert "DO NOT MERGE Sync to joey ub-tv-dev at ↵Youngsang Cho
e7fbaa585b1eb7afec05f05032d2e8d99fb595d4" This reverts commit 369b6a409204a9b2a95f7ba575d7c3b7bdc94ab7. Change-Id: I9abfc39974fa42edcc1eb6b6ec2e53782b4fcf5f
2016-05-09DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4Youngsang Cho
Bug: 28469968 Change-Id: Ie0d3c74af84777dd8f2e2a79aa0454c7e6a7f0d8
2016-05-04Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4Nick Chalko
Change-Id: Ib2da547fc0b23c3b504e2fac9c635954fc03060f
2016-03-04Sync to ub-tv-intens at 4ef2591eb74883f8ae2ce15d4e89bec7da5320fcNick Chalko
Bug: 27219388 Change-Id: I50601d0e0f680f170829945689eef989308b02fa
2016-03-04Sync to ub-tv-intens at 4ef2591eb74883f8ae2ce15d4e89bec7da5320fcNick Chalko
BUg: 27219388 Change-Id: I50601d0e0f680f170829945689eef989308b02fa
2016-02-26Sync to ub-tv-interns at cc7c29d2a24a1343498f6d95ca5a79e003e6aefeNick Chalko
Change-Id: I580da190231e47c65b69f425b30ec4685eb50ce4
2015-12-11Sync to ub-tv-heroes at 1.08.301Nick Chalko
source change id If9b64d7bbc6e8f77b360e502d34e5452775c0402 Change-Id: I4ffe87911cb85e54880d1d918d1b8fb7bb8cfb7d
2015-11-10Sync to ub-tv-glee at 1.07.007Nick Chalko
hash dce17da9f45fc4304787b1898d9915511b1df954 Change-Id: I08ac6fc0123a6653644281155e35c11b71bc5fa0
2015-09-16Sync to ub-tv-friends at 1.06.202Nick Chalko
git hash 3c1965f5dcc60243f1fe600cb35f19bd5f01fc27 Change-Id: I90b77790f9074677ecef72a23235d2b33eacb76a
2015-08-05Sync to ub-tv-er at 1ca2537791704723075f1d1952bb9592b163ce83Nick Chalko
This fixes the broken build. Change-Id: I18e5792fca45400d2e6146bac23479cb18bcba0b
2015-08-03Migrate Live Channels App Src to AOSP branchNick Chalko
Bug: 21625152 Change-Id: I07e2830b27440556dc757e6340b4f77d1c0cbc66