aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-12-10am 14b11122: (-s ours) Merge remote-tracking branch \'origin/kitkat-dev\'HEADwebview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1android-4.4w_r1ub-webview-m40-releasemaster-soongmastermainlollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewkitkat-wearkitkat-devidea133-weekly-releaseBaligh Uddin
* commit '14b111222650bc66253d06b5bc60360ea4703f41': Initial empty repository
2013-11-01Merge remote-tracking branch 'origin/kitkat-dev'chromium_org-pre-replicationidea133Baligh Uddin
2013-10-31Initial empty repositoryBaligh Uddin
2013-03-28Merge from Chromium at DEPS revision r190564android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-cts-releasekitkat-cts-devTorne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I1975b1fce5e96446e4fa27feda7009fe340d4cff
2013-02-26Merge third_party/yasm/source/patched-yasm from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm.git at c960eb11ccda80b10ed50be39df4f0663b371d1d This commit was generated by merge_from_chromium.py. Change-Id: I5a7264846884c74fe58182ae88b6731b3a6e3e87
2013-02-26Add module license file.Torne (Richard Coles)
yasm is LGPL 2.0. Change-Id: I7da0abecbb5ecec16d8f94153e618d5160c59e6b
2013-02-25Initial empty repositoryChad Jones
2012-11-14Update Yasm to 1.2.0 (Yasm Part 3/3)hbono@chromium.org
This change updates our copy of Yasm to 1.2.0. (This change consists of the files not used by Chromium.) BUG=156030 TEST=build Chromium Review URL: https://codereview.chromium.org/11365061 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@167605 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-11-14Update Yasm to 1.2.0 (Yasm Part 2/3)hbono@chromium.org
This change updates our copy of Yasm to 1.2.0. (This change consists of the files not used by Chromium.) BUG=156030 TEST=build Chromium Review URL: https://codereview.chromium.org/11369048 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@167604 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-11-14Update Yasm to 1.2.0 (Yasm Part 1/3)hbono@chromium.org
This change updates our copy of Yasm to 1.2.0. (This change mainly consists of the files used by Chromium.) BUG=156030 TEST=build Chromium Review URL: https://codereview.chromium.org/11364046 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@167603 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-09-03Merge ↵scottmg@chromium.org
https://github.com/yasm/yasm/commit/9728322335cba96500861ef766b1546d096e5600 aka https://github.com/yasm/yasm/pull/64 from upstream. TBR=thakis@chromium.org Review URL: https://chromiumcodereview.appspot.com/10914069 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@154697 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-05-02Merge ↵scottmg@chromium.org
https://github.com/yasm/yasm/commit/ab19547382660d81e0b4a0232dccb38f44c52a36 Review URL: https://chromiumcodereview.appspot.com/10324002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@134927 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-05-01Merge ↵scottmg@chromium.org
https://github.com/yasm/yasm/commit/2bd66514b6b100887c19d8598da38347b3cff40e BUG=125646 Review URL: https://chromiumcodereview.appspot.com/10289003 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@134825 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-11yasm: Fix a compile error introduced by my last commit.thakis@chromium.org
(Upstream at https://github.com/yasm/yasm/pull/63) TBR=fischman Review URL: https://chromiumcodereview.appspot.com/9669043 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@126079 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-11Merge ↵thakis@chromium.org
https://github.com/yasm/yasm/commit/01ab853e68ef8aeded716d6f5b34895200f66a51 Review URL: https://chromiumcodereview.appspot.com/9666037 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@126065 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-02Silence genperf's success-related chatter.fischman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9580022 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@124750 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-29yasm: Merge a clang warning fix.thakis@chromium.org
Namely, https://github.com/yasm/yasm/commit/a2cbb10ee1b90b73647667ac849c74d65761d412 TBR=ajwong Review URL: https://chromiumcodereview.appspot.com/9533001 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@124103 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2011-02-04Support the N_PEXT bit of the Mach-O object format.hbono@chromium.org
This change allows us to set the N_PEXT bit to Mach-O object files when a global symbol has a 'private_extern' extension. BUG=http://www.tortall.net/projects/yasm/ticket/236 TEST=none Review URL: http://codereview.chromium.org/6347060 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@73761 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2011-01-13Update our yasm copy to yasm 1.1.0 (Part1: yasm side)hbono@chromium.org
This change applies all upstream changes between yasm 0.8.0 and yasm 1.1.0 to our yasm copy. (We also need another change to update "yasm.gyp" so we build this updated yasm without errors.) BUG=64640 TEST=build Chromium without errors. Review URL: http://codereview.chromium.org/6170009 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@71296 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2010-06-25Remove svn:executable from files in patched-yasm.thestig@chromium.org
BUG=none TEST=none Review URL: http://codereview.chromium.org/2805034 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@50870 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2009-10-23Patching yasm to be gyp friendly.ajwong@chromium.org
BUG=22307 TEST=none Review URL: http://codereview.chromium.org/326016 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@29937 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2009-10-23Add yasm 0.8.0 into our third-party deps tree.ajwong@chromium.org
BUG=22307 TEST=none. Just checking in source. git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@29921 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 16:45:55 +0000