aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 757c347bd9 -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1android-games-sdk-releaseandroid-games-sdk-games-performance-tuner-releaseandroid-games-sdk-games-memory-advice-releaseandroid-games-sdk-games-frame-pacing-releaseandroid-games-sdk-games-controller-releaseandroid-games-sdk-game-text-input-releaseandroid-games-sdk-game-activity-releaseXin Li
ours am: 9e8ff3c207 -s ours am skip reason: Change-Id I4950cd5b3b71e771b0766c9a1aba3657318c9127 with SHA-1 4a39f58be5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4b3e057864e6b823f50ef7beaee57a858158e966
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 757c347bd9 -s oursXin Li
am skip reason: Change-Id I4950cd5b3b71e771b0766c9a1aba3657318c9127 with SHA-1 4a39f58be5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I59ab2e5e03be6e9afb63a407b56e033f225e2a3b
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I4950cd5b3b71e771b0766c9a1aba3657318c9127 Change-Id: I5da0eb7834d27a19af9365195ce464dcfb228730
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/FXdiv am: eb48e27204 am: ↵Bob Badour
59a9ff3c6f am: a18bac0a26 Original change: https://android-review.googlesource.com/c/platform/external/FXdiv/+/1588628 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I57f3495ae96766bbc9a344a9071dd1a93425de12
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/FXdiv am: eb48e27204 am: 59a9ff3c6fBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/FXdiv/+/1588628 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibe7e66603eca2b4c625bdd2321f01c53d8cdf47d
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/FXdiv am: eb48e27204Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/FXdiv/+/1588628 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I52e824f678b353ece320dd61583fc8e25385c15f
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/FXdivandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I9cab5ad8835b89b01e96d6ddab531f766db8f767
2020-12-10Upgrade FXdiv to 63058eff77e11aa15bf531df5dd34395ec3017c8 am: 13d63439bf am: ↵Haibo Huang
aa4eb53631 am: 4a39f58be5 Original change: https://android-review.googlesource.com/c/platform/external/FXdiv/+/1522384 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie70e84ac97176dc6e31fba0f92fde324394d9b12
2020-12-10Upgrade FXdiv to 63058eff77e11aa15bf531df5dd34395ec3017c8 am: 13d63439bf am: ↵Haibo Huang
aa4eb53631 Original change: https://android-review.googlesource.com/c/platform/external/FXdiv/+/1522384 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4950cd5b3b71e771b0766c9a1aba3657318c9127
2020-12-10Upgrade FXdiv to 63058eff77e11aa15bf531df5dd34395ec3017c8 am: 13d63439bfHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/FXdiv/+/1522384 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0a2c59e9cd4200af47def1a28c34006243654e9c
2020-12-09Upgrade FXdiv to 63058eff77e11aa15bf531df5dd34395ec3017c8Haibo Huang
Test: make Change-Id: I7f406d761f4deadb0ea3715252fc509abddbfa3f
2020-12-08Export LICENSE file in Bazel buildupstream-masterMarat Dukhan
2020-04-17Disable _udiv64 and _udiv128 intrinsics on clang-cl and icpcMarat Dukhan
2020-04-16Upgrade FXdiv to 561254d968e5679460e6a0a743206410284d9f46 am: 74c9d9ef6a am: ↵Haibo Huang
dba5619fc6 am: 57b347b2d9 am: af8a010331 am: 7a8156ad2b Change-Id: I885b798e87a6a7331f375788a5926c2ae54606ec
2020-04-16Upgrade FXdiv to 561254d968e5679460e6a0a743206410284d9f46 am: 74c9d9ef6a am: ↵Haibo Huang
dba5619fc6 am: 57b347b2d9 am: af8a010331 Change-Id: I2ef249c888d9dbe62939779c5f33ba2204ca27c0
2020-04-16Upgrade FXdiv to 561254d968e5679460e6a0a743206410284d9f46 am: 74c9d9ef6a am: ↵Haibo Huang
dba5619fc6 am: 57b347b2d9 Change-Id: I414a51c14e15ce31f4cb24b8ceaa469796dc9cb6
2020-04-15Upgrade FXdiv to 561254d968e5679460e6a0a743206410284d9f46 am: 74c9d9ef6a am: ↵Haibo Huang
dba5619fc6 Change-Id: I3d02c41dabceb2e64c112d595f62163547afe280
2020-04-15Upgrade FXdiv to 561254d968e5679460e6a0a743206410284d9f46 am: 74c9d9ef6aandroid-r-beta-3android-r-beta-2Haibo Huang
Change-Id: If463523d54ae4582aa10026d81929ea2b0848f23
2020-04-15Upgrade FXdiv to 561254d968e5679460e6a0a743206410284d9f46Haibo Huang
Exempt-From-Owner-Approval: upgrade Change-Id: I7a7b45fc6c860fb0ecdd58baf7a1e700ce16e229
2020-04-12Update READMEMarat Dukhan
2020-04-12Disable inline assembly by defaultMarat Dukhan
2020-04-12Indicate cloberred condition flags in inline assemblyMarat Dukhan
2020-04-12Add disabled 128 / 64 -> 64 division implementation using __int128Marat Dukhan
2020-04-12Modernize CMake configuration filesMarat Dukhan
2020-04-12Update Google Benchmark in CMake builds to 1.5.0Marat Dukhan
2020-04-12Use _udiv64 and _udiv128 intrinsics on MSVCMarat Dukhan
2020-04-12Enable _BitScanReverse/_BitScanReverse64 in ARM/ARM64 buildsMarat Dukhan
2020-04-12Update Google Test in CMake builds to 1.10.0Marat Dukhan
2020-04-10Add Bazel configuration filesMarat Dukhan
2020-04-10Minor cleanup in fallback 64-bit CLZMarat Dukhan
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 80f3373a22 -s ours am: c15502b9b4 am: d1dcb1cce5 am: 83eeb2b987 -s ours am skip reason: subject contains skip directive Change-Id: Icba9e58843bafa234ac668c5d5594d1c443871f1
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 80f3373a22 -s ours am: c15502b9b4 am: d1dcb1cce5 Change-Id: I05948c05ce536eb1bd9f912de969741ad6b62a0e
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 80f3373a22 -s ours am: c15502b9b4 Change-Id: I49fce06cac8090f70b1da495fe0b251f6c4158be
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 80f3373a22 -s ours am skip reason: subject contains skip directive Change-Id: Ia2cd32551be1fbe66937d219da86b6f52ed56f12
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I6f87fe499604047644d1b2c130b69b6941d29f36
2020-03-26Remove redundant NOTICE symbolic link. am: 76a395c804 am: 31e86329bc am: ↵Bob Badour
567aeded00 am: eec669e2ac am: 6331b5cd38 Change-Id: I234ac20fc66bc530a15e3b2451475dc533d53e28
2020-03-26Remove redundant NOTICE symbolic link. am: 76a395c804 am: 31e86329bc am: ↵Bob Badour
567aeded00 am: eec669e2ac Change-Id: I4e4d0a14f403c802725c72e21f3c417a34773e78
2020-03-26Remove redundant NOTICE symbolic link. am: 76a395c804 am: 31e86329bc am: ↵Bob Badour
567aeded00 Change-Id: Ibf58562ea14abd949d49c082e98974f252ce20b7
2020-03-26Remove redundant NOTICE symbolic link. am: 76a395c804 am: 31e86329bcBob Badour
Change-Id: I9922708d11d089171eb27999c9a99bb6f39e8265
2020-03-26Remove redundant NOTICE symbolic link. am: 76a395c804 am: 31e86329bcBob Badour
Change-Id: I431775d7701beb5479d89df38a8d5410b9c9174f
2020-03-26Remove redundant NOTICE symbolic link. am: 76a395c804Bob Badour
Change-Id: Idb083692aa909ec766c860e268ef326510dc49aa
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: I435a659dc8f3b0ae90ead7c7beb60004bda1be33
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: d9905688eb -s ours am: a27665e1b3 am: 5023fc0059 am: c0cd948a77 -s ours am skip reason: subject contains skip directive Change-Id: Ibbbfc5a04ac3b1e0a5461f5cbeeb6a8c15a49297
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: d9905688eb -s ours am: a27665e1b3 am: 5023fc0059 Change-Id: Ia76974812ac46475d7f9b018c5b6e1a602b3c586
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: d9905688eb -s ours am: a27665e1b3 Change-Id: I21a91b98fdef85a45929de5afb852851bedbf723
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: d9905688eb Change-Id: Id66d25cd407b291d0236f49da338e52f81a6bbec
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: d9905688eb -s ours am skip reason: subject contains skip directive Change-Id: I3c861311bd418de730af1efea4afb7bb6af4a3cc
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Ic4c968b9ea2db43b421025cbca38cf98c6c63702
2020-02-12Add OWNERS am: c3ea0c58a0 am: 5432d142d5 am: 9c4f14e13er_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseAutomerger Merge Worker
Change-Id: Id55140f63929ff55881910fd70bee562c36aa326
2020-02-12Add OWNERS am: c3ea0c58a0 am: 5432d142d5Automerger Merge Worker
Change-Id: I66fc6d04b8b06bd2592bf4bbfb4ba5d20f6b88b2