aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-07-16Merge "Fix mac SDK build"HEADandroid-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-s-beta-5mastermainandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1android-s-beta-5Treehugger Robot
2021-07-15Fix mac SDK buildColin Cross
Use platform-macos.cc for darwin builds to fix the aosp-sdk-release mac build. Bug: 192252696 Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo Change-Id: Id42262e95d24938e0eafa637b7afb41393cff71e
2021-06-24Merge "Fix OSX builds for V8"android-s-beta-4android-s-beta-3android-s-beta-4Treehugger Robot
2021-06-23Fix OSX builds for V8Rubin Xu
Bug: 182984982 Bug: 191617201 Test: fix sdk builds Change-Id: I85856a45ef0c3795b369608b2fe9ad2dce298df1
2021-06-21Merge "DO NOT MERGE - Merge RQ3A.210605.005"Xin Li
2021-06-18DO NOT MERGE - Merge RQ3A.210605.005Xin Li
Bug: 190855093 Merged-In: I0f6e83577001c5f5e6bf06913ba6dc8c49d9eb75 Change-Id: I7f250b84370fcdac69da147e8864e9709c7e3174
2021-06-17DO NOT MERGE - Mark RQ3A.210410.001 as mergedtmp_sam_RQ3A.210605.005Xin Li
Bug: 190855093 Merged-In: I1619a1c7294b484128a4c557855c75222b01c646 Change-Id: I0f6e83577001c5f5e6bf06913ba6dc8c49d9eb75
2021-06-17DO NOT MERGE - Merge ab/7272582Xin Li
Bug: 190855093 Merged-In: Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e Change-Id: I1619a1c7294b484128a4c557855c75222b01c646
2021-04-06Snap for 7262953 from e11facc1049b2a0c85e4f3e5ff214127851ddf2f to ↵android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid-build-team Robot
rvc-qpr3-release Change-Id: Iae0a5ef411ead7201768d5c574a4676142bf7968
2021-04-06Update v8 cfi blocklist am: 2dc3777900 am: e11facc104temp_ab_7272582Cindy Zhou
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13949411 Change-Id: I3ed56cf1777b1fd23f5b83c02684f35a9a33ed8c
2021-04-06Update v8 cfi blocklist am: 2dc3777900Cindy Zhou
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13949411 Change-Id: I4b8313c4d29464d13c66add8c2932aeb3655b868
2021-04-06Update v8 cfi blocklistCindy Zhou
The api-arguments-inl.h file seem to have been moved so the blocklist was not working and new cfi crashes were emerging. This commit updates the list so the correct file path is used. Test: proxy_resolver_v8_unittest Bug: 183079234 Bug: 162604069 Bug: 167389063 Change-Id: I70b5cd699d33fa4eda3f76cfac1ca1c71f92547a
2021-03-17Snap for 7215955 from 2eab410d1a22744d330b3a4565f26a52c1d1d8eb to ↵android-build-team Robot
rvc-qpr3-release Change-Id: Ib9fdea283ccfadaae934f93993aaf2955e1d5831
2021-03-17[automerger skipped] [DO NOT MERGE] Fix OSX builds for V8 am: 5658a66011 -s ↵Rubin Xu
ours am: 05251a6458 -s ours am: 70ec779ad7 am: 655032cb7c -s ours am: c509674b68 am: 2eab410d1a Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13799500 Change-Id: I6883ad222507a37d11ca825448b6ceec930e6f51
2021-03-17[automerger skipped] [DO NOT MERGE] Fix OSX builds for V8 am: 5658a66011 -s ↵Rubin Xu
ours am: 05251a6458 -s ours am: 70ec779ad7 am: 655032cb7c -s ours am: c509674b68 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13799500 Change-Id: I8b94be689a70a2e0590244117e4f9c4a84ff26cf
2021-03-17[automerger skipped] [DO NOT MERGE] Fix OSX builds for V8 am: 5658a66011 -s ↵Rubin Xu
ours am: 05251a6458 -s ours am: 70ec779ad7 am: 655032cb7c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13799500 Change-Id: Id90137931ba6224330aa4f9fb7c40ccde7d75fa2
2021-03-17[automerger skipped] [DO NOT MERGE] Fix OSX builds for V8 am: 5658a66011 -s ↵Rubin Xu
ours am: 05251a6458 -s ours am: 70ec779ad7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13799500 Change-Id: Iab9638c60ae6ba5364f304728c4e1602a1064744
2021-03-17[automerger skipped] [DO NOT MERGE] Fix OSX builds for V8 am: 5658a66011 -s ↵Rubin Xu
ours am: 05251a6458 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13799500 Change-Id: I5645d4066eb10552d20e8fbb7cb2197f300e886e
2021-03-17[automerger skipped] [DO NOT MERGE] Fix OSX builds for V8 am: 5658a66011 -s oursRubin Xu
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13799500 Change-Id: I8d736b9608eb1441df9e526460208f1a298c8c18
2021-03-17[DO NOT MERGE] Fix OSX builds for V8Rubin Xu
Bug: 182984982 Test: fix sdk builds Change-Id: I85856a45ef0c3795b369608b2fe9ad2dce298df1
2021-03-06Snap for 7189773 from de8ec0ef8ea53fea36a005ee9743ed5d14b21cb5 to ↵android-build-team Robot
rvc-qpr3-release Change-Id: I45d3a53686678e34602a70b806f62c2416f0623d
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 1db205cd1d -s ours am: ↵Rubin Xu
431665bce4 -s ours am: 2aabb349f6 -s ours am: 2df4129b0c -s ours am: bb466bedb2 -s ours am: de8ec0ef8e -s ours am skip reason: Change-Id Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e with SHA-1 9580a23bc5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13581949 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I55872afba5da1f888864d871f5dc63476946649b
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 9580a23bc5 -s ours am: ↵Rubin Xu
9da229f5d4 -s ours am: 2c681ee209 -s ours am: bc701d183e -s ours am: e3cb40c014 -s ours am skip reason: Change-Id Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e with SHA-1 6e1e26aaef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13581948 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0bf38a094100b55d90dd6e20d79838119b3102e6
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 1db205cd1d -s ours am: ↵Rubin Xu
431665bce4 -s ours am: 2aabb349f6 -s ours am: 2df4129b0c -s ours am: bb466bedb2 -s ours am skip reason: Change-Id Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e with SHA-1 9580a23bc5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13581949 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie2faa6f6c83fb50d275eb80621fc92e0e87b6480
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 9580a23bc5 -s ours am: ↵Rubin Xu
9da229f5d4 -s ours am: 2c681ee209 -s ours am: bc701d183e -s ours am skip reason: Change-Id Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e with SHA-1 6e1e26aaef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13581948 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iccdcefc107da43ef991f4f3af5323b7966a2dd21
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 1db205cd1d -s ours am: ↵Rubin Xu
431665bce4 -s ours am: 2aabb349f6 -s ours am: 2df4129b0c -s ours am skip reason: Change-Id Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e with SHA-1 9580a23bc5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13581949 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I61cf970cd12e669abc189b99f0139ec0f436b184
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 9580a23bc5 -s ours am: ↵Rubin Xu
9da229f5d4 -s ours am: 2c681ee209 -s ours am skip reason: Change-Id Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e with SHA-1 6e1e26aaef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13581948 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6413afb4aefa14f02ceb997adf231b4bc70ba65b
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 1db205cd1d -s ours am: ↵Rubin Xu
431665bce4 -s ours am: 2aabb349f6 -s ours am skip reason: Change-Id Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e with SHA-1 9580a23bc5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13581949 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I931948368d1e67fbaebc081319e50818896b67e9
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 9580a23bc5 -s ours am: ↵Rubin Xu
9da229f5d4 -s ours am skip reason: Change-Id Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e with SHA-1 6e1e26aaef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13581948 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If66d41ba66fcc977447fbedce4fa6769ffe4d8f1
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 1db205cd1d -s ours am: ↵Rubin Xu
431665bce4 -s ours am skip reason: Change-Id Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e with SHA-1 9580a23bc5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13581949 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id20fcca828ee0787cd54f6fea45a87b544977936
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 9580a23bc5 -s oursRubin Xu
am skip reason: Change-Id Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e with SHA-1 6e1e26aaef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13581948 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4f9aec64cea3b92f4e761ea6159b7c0a3bef9b5c
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 1db205cd1d -s oursRubin Xu
am skip reason: Change-Id Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e with SHA-1 9580a23bc5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13581949 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie13f6c6b98a38d3b4ea2dc2e9e1c098012b20588
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 6e1e26aaef am: ae1064c294 ↵Rubin Xu
-s ours am: c3da845b24 am: a4d26e1709 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13537925 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8d67d7233562831f5c0abe93a17b50734421f3bf
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 6e1e26aaef am: ae1064c294 ↵Rubin Xu
-s ours am: c3da845b24 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13537925 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2c89514d3d76e4e5d286c4eecd500d844c821008
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 6e1e26aaef am: ae1064c294 ↵Rubin Xu
-s ours am skip reason: skipped by user rubinxu Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13537925 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idbd12757656a54ead680feb86b31d4e0eb44314e
2021-03-05Upgrade V8 to 8.8.278.14 am: 6e1e26aaefRubin Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13537925 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia2fdc9561d11243fd2fc458c08461d0b0d651099
2021-03-05resolve merge conflicts of 00804fc394e3ba4591be935138da607d8ecf6da1 to ↵Rubin Xu
rvc-qpr-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: If3030e82aeb3dac9f46e8124e22e44af4bdd9153
2021-03-03[automerger skipped] Merge "Merge RQ2A.210305.007" am: c5b3df7061 -s ours ↵Xin Li
am: e6cf5f1178 -s ours am skip reason: Change-Id Ibc0d1da3a5d1e06539afc126dbe55ee7acb3467f with SHA-1 eb9b08255a is in history Original change: https://android-review.googlesource.com/c/platform/external/v8/+/1613640 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1a8d99db63d7601e4a29a485bfbc2975ea824934
2021-03-03Snap for 7183002 from 00804fc394e3ba4591be935138da607d8ecf6da1 to ↵android-build-team Robot
rvc-qpr3-release Change-Id: I1e205be9c76217c8401371000816050ee67ade23
2021-03-03[automerger skipped] Merge "Merge RQ2A.210305.007" am: c5b3df7061 -s oursXin Li
am skip reason: Change-Id Ibc0d1da3a5d1e06539afc126dbe55ee7acb3467f with SHA-1 eb9b08255a is in history Original change: https://android-review.googlesource.com/c/platform/external/v8/+/1613640 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I02874169636db6a77d4a999d8d1572d2ea1a7a22
2021-03-03Merge "Merge RQ2A.210305.007"android-s-beta-2android-s-beta-1Xin Li
2021-03-03Upgrade V8 to 8.8.278.14 am: 7314a9fc10Rubin Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13607885 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ida00558b19e7ae619c78a172967d457d6b185870
2021-03-03Merge RQ2A.210305.007Xin Li
Bug: 180401296 Merged-In: Ibc0d1da3a5d1e06539afc126dbe55ee7acb3467f Change-Id: Ia6197951dd17e9ed0da9af01601b8878b6557e67
2021-03-02Merge RQ2A.210305.007 into stage. am: eb9b08255aXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13724678 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I25ebb843fb10313ffbce5d7e46d1d4e0d6e01475
2021-03-01Merge RQ2A.210305.007 into stage.temp_RQ2A.210305.007Xin Li
Bug: 180401296 Merged-In: I547b1a0cb88094ed79bf6ffe034df7f8834be4d1 Change-Id: Ibc0d1da3a5d1e06539afc126dbe55ee7acb3467f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9c3afeb0ca -s oursXin Li
am skip reason: Change-Id I008e3369f1061adfb529d921a3038dda4b5d3ebb with SHA-1 495d491ecc is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I94a3f40b24c533faa160259e8d60acf38ac13677
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I008e3369f1061adfb529d921a3038dda4b5d3ebb Change-Id: I3ef7451ac6848ecc4810854af8f0534b0b140baa
2021-02-18Upgrade V8 to 8.8.278.14Rubin Xu
Bug: 162604069 Bug: 167389063 Test: gts-tradefed run gts-dev --module GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest Test: m -j proxy_resolver_v8_unittest && adb sync && adb shell \ /data/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Change-Id: Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e
2021-02-17Upgrade V8 to 8.8.278.14Rubin Xu
Bug: 162604069 Bug: 167389063 Test: gts-tradefed run gts-dev --module GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest Test: m -j proxy_resolver_v8_unittest && adb sync && adb shell \ /data/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Change-Id: Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e
2021-02-16Upgrade V8 to 8.8.278.14Rubin Xu
Bug: 162604069 Bug: 167389063 Test: gts-tradefed run gts-dev --module GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest Test: m -j proxy_resolver_v8_unittest && adb sync && adb shell \ /data/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Merged-In: Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e Change-Id: Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e