summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 7c8fb4fbc2 -s ↵android-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-devXin Li
ours am: 31b50afaf4 -s ours am skip reason: Change-Id I4638c449d15b24d3b6adcdc15f39ae7c5b981eba with SHA-1 fc923314d5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idd69a369b37acc9857d46f5e77dd2b553fa47be7
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 7c8fb4fbc2 -s oursXin Li
am skip reason: Change-Id I4638c449d15b24d3b6adcdc15f39ae7c5b981eba with SHA-1 fc923314d5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie3d27b8e97eee291ef4fa3903b1e59d3d6e110a4
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: I4638c449d15b24d3b6adcdc15f39ae7c5b981eba Change-Id: Ic222e9f83f69ee739a97bf3d79bc300f92951f03
2021-01-29Base art_module_* products off module_*. am: 2a5f3d1d9b am: 78aa5d35ff am: ↵Martin Stjernholm
146ded8937 Original change: https://android-review.googlesource.com/c/device/generic/art/+/1555281 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I30bb5f7467ce5cfdec868df03678d191010c01c1
2021-01-29Base art_module_* products off module_*. am: 2a5f3d1d9b am: 78aa5d35ffMartin Stjernholm
Original change: https://android-review.googlesource.com/c/device/generic/art/+/1555281 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I65f8f6054561c3dc792869814e8b00c3aaa574d1
2021-01-29Base art_module_* products off module_*. am: 2a5f3d1d9bMartin Stjernholm
Original change: https://android-review.googlesource.com/c/device/generic/art/+/1555281 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iec91420cc66cd0a17afed0d16ba40d32647d2713
2021-01-27Base art_module_* products off module_*.android-s-preview-1Martin Stjernholm
They're more consistent and closer to the products used in build_mainline_modules.sh. In particular this avoids the special case in build/make/target/board/generic_arm64/BoardConfig.mk where TARGET_BUILD_APPS affects TARGET_2ND_ARCH_VARIANT for arm64 builds. Test: art/build/build-art-module.sh - check that produced APEXes are bit identical before and after the change. Bug: 176171716 Change-Id: Iad847b8e718dc00e15a006853b36ae750d6b75a4
2021-01-12Use the functions intended for adding Soong config variables. am: 39c9c511cd ↵Martin Stjernholm
am: a3a97078a4 am: 9c514568fe Original change: https://android-review.googlesource.com/c/device/generic/art/+/1533263 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I010f1bbb9c96f32b6a099b7f2329898b4dcd43c1
2021-01-12Use the functions intended for adding Soong config variables. am: 39c9c511cd ↵Martin Stjernholm
am: a3a97078a4 Original change: https://android-review.googlesource.com/c/device/generic/art/+/1533263 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I276af8ffeba4d6c2f30ca9b903e394b608975607
2021-01-12Use the functions intended for adding Soong config variables. am: 39c9c511cdMartin Stjernholm
Original change: https://android-review.googlesource.com/c/device/generic/art/+/1533263 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie3af54d3c13dc823ee24ad775425186907d31104
2020-12-18Use the functions intended for adding Soong config variables.Martin Stjernholm
Test: m Bug: 172480615 Change-Id: I04ead1eed802747aa7eea5c7b354d7cc3d05c40f
2020-12-10Merge "Introduce a Soong config variable to flip to ART Module sources when ↵Martin Stjernholm
prebuilts are preferred by default." am: ba62030943 am: 05b65151d2 am: fc923314d5 Original change: https://android-review.googlesource.com/c/device/generic/art/+/1513781 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieff47436b1e4dc657fdc6877798963fcd0f8c6b6
2020-12-10Merge "Introduce a Soong config variable to flip to ART Module sources when ↵Martin Stjernholm
prebuilts are preferred by default." am: ba62030943 am: 05b65151d2 Original change: https://android-review.googlesource.com/c/device/generic/art/+/1513781 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4638c449d15b24d3b6adcdc15f39ae7c5b981eba
2020-12-10Merge "Introduce a Soong config variable to flip to ART Module sources when ↵Martin Stjernholm
prebuilts are preferred by default." am: ba62030943 Original change: https://android-review.googlesource.com/c/device/generic/art/+/1513781 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9c15d032104c9495e2a13146defe0d6194cfb05e
2020-12-10Merge "Introduce a Soong config variable to flip to ART Module sources when ↵Martin Stjernholm
prebuilts are preferred by default."
2020-12-07Introduce a Soong config variable to flip to ART Module sources whenMartin Stjernholm
prebuilts are preferred by default. It enables the apex/sdk/module_exports modules and toggles off the prefer flags on the ART Module prebuilts when the ART-specific products are used, typically on master-art. Also add new generic architecture products for use in art/build/build-art-module.sh to build the ART Module prebuilts. Test: m TARGET_PRODUCT=art_module_{arm,arm64,x86,x86_64} nothing Bug: 172480617 Change-Id: Id1c91ebe47a24167374530643e0e444f74d9d3a0
2020-11-24Mark ab/6881855 as merged am: 323bc9e331 am: 4c0e776de5Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/art/+/13112082 Change-Id: Id087d2625c693493d80b90ac1f4164de618fbfa5
2020-11-24Mark ab/6881855 as merged am: 323bc9e331Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/art/+/13112082 Change-Id: I5a14e87f6f090fce02bb6f24ed2ea7def4e76afd
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ia87325bed78d72137a24a009f01aa3a462ec76dc
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 0825ebfcca -s ours am: ↵Xin Li
3b98e69cc2 -s ours am: 201e10002f -s ours am skip reason: Change-Id I964c2e898eacd76db377e988193849e89d1edcc4 with SHA-1 2c57993d35 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/art/+/12793671 Change-Id: I721b5c2e42670013ec1b49877c4977905662abd7
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 0825ebfcca -s ours am: ↵Xin Li
3b98e69cc2 -s ours am skip reason: Change-Id I964c2e898eacd76db377e988193849e89d1edcc4 with SHA-1 2c57993d35 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/art/+/12793671 Change-Id: I9967d3042413b6e3586f7fc6a6e39e6ff8247e4d
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 0825ebfcca -s oursXin Li
am skip reason: Change-Id I964c2e898eacd76db377e988193849e89d1edcc4 with SHA-1 2c57993d35 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/generic/art/+/12793671 Change-Id: I7ea223b85b098c3960ae758cab293b3eb11be498
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I964c2e898eacd76db377e988193849e89d1edcc4 Change-Id: I38f7860aa1dac744b01989e749a3afd720bf8b94
2020-09-22Create a target for Arm Cortex-A55 cpu variant. am: 4c0867c466 am: ↵Raphael Gault
24a058de76 am: 7da2d3f13a am: aac3ad6d0d am: 550bf0d6ae Original change: https://android-review.googlesource.com/c/device/generic/art/+/1426691 Change-Id: I2bd442edb9b6ba02e8314e64f32d790558decf78
2020-09-22Create a target for Arm Cortex-A55 cpu variant. am: 4c0867c466 am: ↵Raphael Gault
24a058de76 am: 7da2d3f13a am: aac3ad6d0d Original change: https://android-review.googlesource.com/c/device/generic/art/+/1426691 Change-Id: If5fabd127814acaf5f7bb0b70286a9ab53d93360
2020-09-22Create a target for Arm Cortex-A55 cpu variant. am: 4c0867c466 am: ↵Raphael Gault
24a058de76 am: 7da2d3f13a Original change: https://android-review.googlesource.com/c/device/generic/art/+/1426691 Change-Id: I9099ead60e9bc4fa50159ab70caeab113ec4e4f0
2020-09-22Create a target for Arm Cortex-A55 cpu variant. am: 4c0867c466 am: 24a058de76Raphael Gault
Original change: https://android-review.googlesource.com/c/device/generic/art/+/1426691 Change-Id: Ie7dd13373a1ac1cb5a69694f925cb6d668be7a61
2020-09-22Create a target for Arm Cortex-A55 cpu variant. am: 4c0867c466Raphael Gault
Original change: https://android-review.googlesource.com/c/device/generic/art/+/1426691 Change-Id: I46c78232a02d6447971a37101d593576ea71c90e
2020-09-11Create a target for Arm Cortex-A55 cpu variant.Raphael Gault
Support a new cpu variant to be able to test Armv8.X features on Cortex-A55 devices. Test: test-art-target Change-Id: Ib4108a04b117e24526061a9a46ac5b3e710b504b
2020-06-08Merge "Remove no-op references to obsolete variables." am: c182b2e5fe am: ↵Elliott Hughes
a80c59e58a am: 0e92ac6b74 am: 2c57993d35 am: 8540905316 Original change: https://android-review.googlesource.com/c/device/generic/art/+/1326040 Change-Id: I5c4af778a2d44e5f2dc9ae918c61e0244311e11c
2020-06-08Merge "Remove no-op references to obsolete variables." am: c182b2e5fe am: ↵Elliott Hughes
a80c59e58a am: 0e92ac6b74 am: 2c57993d35 Original change: https://android-review.googlesource.com/c/device/generic/art/+/1326040 Change-Id: Ic55ea9204df8b1254e35eb22a3bc50d92786e37b
2020-06-08Merge "Remove no-op references to obsolete variables." am: c182b2e5fe am: ↵Elliott Hughes
a80c59e58a am: 0e92ac6b74 Original change: https://android-review.googlesource.com/c/device/generic/art/+/1326040 Change-Id: I964c2e898eacd76db377e988193849e89d1edcc4
2020-06-08Merge "Remove no-op references to obsolete variables." am: c182b2e5fe am: ↵Elliott Hughes
a80c59e58a Original change: https://android-review.googlesource.com/c/device/generic/art/+/1326040 Change-Id: Ibe6b8e298988bff28cef18fdea2ff8281b0346c8
2020-06-08Merge "Remove no-op references to obsolete variables." am: c182b2e5feElliott Hughes
Original change: https://android-review.googlesource.com/c/device/generic/art/+/1326040 Change-Id: I63757c0d04572bb600fdb73d4ec2d2d1321f2ce2
2020-06-08Merge "Remove no-op references to obsolete variables."android-r-beta-3android-r-beta-2Elliott Hughes
2020-06-08Remove no-op references to obsolete variables.Elliott Hughes
Spotted by treehugger when trying to turn references to these into errors. Bug: https://issuetracker.google.com/138812821 Test: treehugger Change-Id: I4aa245f627fba796cc917841aa3bd878263b5314
2020-05-02Add METADATA to art: Apache2=NOTICE am: 526e17958a am: eeed37039b am: ↵Bob Badour
e9341e08da am: 647614db2a am: 71910e8a7f Change-Id: Ic2e48c1c9a4bcffe426b88781832e554585b2cd6
2020-05-02Add METADATA to art: Apache2=NOTICE am: 526e17958a am: eeed37039b am: ↵Bob Badour
e9341e08da am: 647614db2a Change-Id: I5a438866ab705d9160a610b9889e543d016d7c05
2020-05-02Add METADATA to art: Apache2=NOTICE am: 526e17958a am: eeed37039b am: e9341e08daBob Badour
Change-Id: I54ef3ebc82c6c880ea4a8cdea28613610a2a52d1
2020-05-02Add METADATA to art: Apache2=NOTICE am: 526e17958a am: eeed37039bBob Badour
Change-Id: I9d3b3fd6d0e4774f1ba13e110d1e4c240a91f81a
2020-05-02Add METADATA to art: Apache2=NOTICE am: 526e17958aBob Badour
Change-Id: I90bb06277ea29e22051d9afa6fe666f690888e2d
2020-05-01Add METADATA to art: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: If812787fd67f4acc78f2f5cccce01af862f1c875
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 88cc05b5a7 -s ours am: 237254c148 am: 043078859e am: 9043c16915 -s ours am skip reason: subject contains skip directive Change-Id: Idc28995ce7f6c60016a71c8f0945c5ab74e4a4ea
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 88cc05b5a7 -s ours am: 237254c148 am: 043078859e Change-Id: I21e6320d316baa68cbd6c4b79d5c04ea588b225f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 88cc05b5a7 -s ours am: 237254c148 Change-Id: I432839856e814ccb4316d4bd0a2a4ee0ab99331b
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 88cc05b5a7 -s ours am skip reason: subject contains skip directive Change-Id: I505c8d26b2933f945b95c20977cbe7fecba3207f
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I70bb60bdf29e49625530d289bac68a941ab5c56d
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: e6626837a5 -s ours am: 69197c2397 am: 4601f488fe am: e32703b26a -s ours am skip reason: subject contains skip directive Change-Id: Id69b6b6cae58b2a0dc70995efc2ffc5f02b07f62
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: e6626837a5 -s ours am: 69197c2397 am: 4601f488fe Change-Id: I6f165170949d7522534e9061d2503d92091c61d2
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: e6626837a5 -s ours am: 69197c2397 Change-Id: I6944f409b03efe4d40695204c6ac914e3129a02c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 16:19:58 +0000