aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-07-11Merge "Remove dependency on std::tr1"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseHaibo Huang
am: 9d1c18ddd0 Change-Id: I4fdb2586216d6ce5520bb47bf692a767d40c34a3
2018-07-11Merge "Remove dependency on std::tr1"android-p-preview-5android-n-iot-release-smart-display-r2Treehugger Robot
2018-07-11Remove dependency on std::tr1Haibo Huang
This change is to make webrtc compatible with new googletest. Test: compile Change-Id: I91fa5ce8a986e35209986bef5dc0b2202155623f
2018-07-10Merge "Add METADATA for webrtc"Haibo Huang
am: a95c577462 Change-Id: I3628dba33bb3f3593eb4b5c66d595f3f02575c38
2018-07-11Merge "Add METADATA for webrtc"Treehugger Robot
2018-07-10Add METADATA for webrtcHaibo Huang
Test: NA Exempt-From-Owner-Approval: conflict with upstream OWNERS file Change-Id: I28f133b0dfd684a8e83ce83c3f58ceda10f55f26
2018-01-30Merge "Add empty Android.mk to prevent recursion." am: dbf4e66374 am: c6ebc088d5android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devDan Willemsen
am: 9f02eec6dd Change-Id: Ica423b2f555491560a66c4958f8cdd200d3fefbb
2018-01-30Merge "Add empty Android.mk to prevent recursion." am: dbf4e66374Dan Willemsen
am: c6ebc088d5 Change-Id: I97d9b65784d9d75c0767d17e65c68ddeb6e5e12b
2018-01-30Merge "Add empty Android.mk to prevent recursion."Dan Willemsen
am: dbf4e66374 Change-Id: Iff8ffb5b67b29598bd6aa3cacffeef3b6b63efea
2018-01-30Merge "Add empty Android.mk to prevent recursion."android-wear-p-preview-2android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Treehugger Robot
2018-01-29Add empty Android.mk to prevent recursion.Dan Willemsen
Bug: 72661763 Test: find . -name 'Android.mk' Change-Id: I8373f1433561bd9ae4652dc58bd2fbcb8e7d721e
2017-12-15Merge "Remove dead symlink." am: 6c96047132 am: e246bc0c46Steven Moreland
am: 971b703804 Change-Id: I2d40eded09c7b479e77fd392a24f886b4dcfa033
2017-12-15Merge "Remove dead symlink." am: 6c96047132Steven Moreland
am: e246bc0c46 Change-Id: I16453b38257021818fa473996680864a421ad5f9
2017-12-15Merge "Remove dead symlink."Steven Moreland
am: 6c96047132 Change-Id: I8178efea67947adcf4395a84b89f85dbe445dff4
2017-12-15Merge "Remove dead symlink."android-wear-8.0.0_r1Treehugger Robot
2017-12-15Remove dead symlink.Steven Moreland
Bug: none Test: none Change-Id: I0be329b9137db166320cb4820c8cd4bbcb8b3e7f
2017-11-15Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
am: a095605674 Change-Id: I459fd3092be0bd325272eae31efa5ea616ef473a
2017-11-14Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
Change-Id: I2f688d32edc062ef5ddd5fe2afe9acfadfa3c73b
2017-11-13Merge commit 'd204c81fdce889de60ce69cfa5c3da1249dc8533' into HEADXin Li
Change-Id: Idf8e115f8db81f5ec76553c405ba58f47d80c0f8
2017-10-27Merge "Use -Werror in external/webrtc" am: 5768aa953f am: 0507baf9b1Chih-hung Hsieh
am: 65f75275ee Change-Id: I497bdbc8e44368985d5aa4a7005f7fa1d989bfc9
2017-10-27Merge "Use -Werror in external/webrtc" am: 5768aa953fChih-hung Hsieh
am: 0507baf9b1 Change-Id: I7cb440b8f68e201966e25996091a9d1d1f6f073a
2017-10-27Merge "Use -Werror in external/webrtc"Chih-hung Hsieh
am: 5768aa953f Change-Id: Iae812431d1c34002e931e497f1b70cbf2f698ffa
2017-10-26Merge "Use -Werror in external/webrtc"android-o-mr1-iot-preview-6o-mr1-iot-preview-6Chih-hung Hsieh
2017-10-26Use -Werror in external/webrtcChih-Hung Hsieh
* Suppress existing missing-braces warning. Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: I56af504b26843d0c9e6a56699f30996d8a1b74b8
2017-10-26Merge "Add 'vendor: true' to headers to fix vndk builds" am: c333849418 am: ↵Dan Willemsen
666817c7d1 am: 2f7f5be1df Change-Id: I0606da5136a96ef7fd098f6197ed9906a09cf7e8
2017-10-26Merge "Add 'vendor: true' to headers to fix vndk builds" am: c333849418Dan Willemsen
am: 666817c7d1 Change-Id: Ic02d71e88487502a1af99ade46329b68bf5f13dd
2017-10-26Merge "Add 'vendor: true' to headers to fix vndk builds"Dan Willemsen
am: c333849418 Change-Id: I2a34f700a1735f2ae000b34ae137a96553ac367e
2017-10-26Merge "Add 'vendor: true' to headers to fix vndk builds"Dan Willemsen
2017-10-26Add 'vendor: true' to headers to fix vndk buildsDan Willemsen
Test: lunch aosp_arm64_ab-eng; mmma external/webrtc Change-Id: I39c4bde6811bcb7bd1970338c8429bc9564b0ea0
2017-10-26Merge changes from topic "instruction_set_replace" am: e1ce5311ac am: ff3826d382Dan Willemsen
am: a3f42b7dc9 Change-Id: If979a9ee89e02cb5c2c79e93e54d7ec69c257bd9
2017-10-26Remove WEBRTC_BUILD_NEON_LIBS am: aa415f46df am: d0febdf096Dan Willemsen
am: 353cd3b8aa Change-Id: If557e90a04faec0c458110f1ba9892696de4d922
2017-10-26Include test makefile am: d526425f55 am: db2b8a8c69Dan Willemsen
am: 825d470d20 Change-Id: Ib5a3a405990202a37c46f8dca3dcb8d4239c7ff0
2017-10-26Remove unused gnustl webrtc variants am: c3f927f4f5 am: cc3f37b54eDan Willemsen
am: dcb7e9ea5c Change-Id: I87240ad1d4d6545dc39f93b3082d24525c16fdf3
2017-10-26Merge changes from topic "instruction_set_replace" am: e1ce5311acDan Willemsen
am: ff3826d382 Change-Id: I0158667972232c59f10ca31e84ebc87973e54bc1
2017-10-26Remove WEBRTC_BUILD_NEON_LIBS am: aa415f46dfDan Willemsen
am: d0febdf096 Change-Id: Idd524e65c7ecb3bc0bcc6b07c876d91e19d10ea3
2017-10-26Include test makefile am: d526425f55Dan Willemsen
am: db2b8a8c69 Change-Id: I1a5c6744c78841cf0edf26fc4a1b684e43e0d616
2017-10-26Remove unused gnustl webrtc variants am: c3f927f4f5Dan Willemsen
am: cc3f37b54e Change-Id: I9b3773f1ba4b86bb29002230f161fa59a6e1b993
2017-10-26Merge changes from topic "instruction_set_replace"Dan Willemsen
am: e1ce5311ac Change-Id: If7dcd81893e272465694656e955c1081bdc12457
2017-10-26Remove WEBRTC_BUILD_NEON_LIBSDan Willemsen
am: aa415f46df Change-Id: I3fc2a088fcbae3f324320bdae46404bdfcd52b75
2017-10-26Include test makefileDan Willemsen
am: d526425f55 Change-Id: Icb8cd8f69bc975112ec2928cc713379bc4893eeb
2017-10-26Remove unused gnustl webrtc variantsDan Willemsen
am: c3f927f4f5 Change-Id: I185117b455e7d2eb2cc32ab53a5d0dacd0f687af
2017-10-26Merge changes from topic "instruction_set_replace"Treehugger Robot
* changes: Convert to Android.bp Remove WEBRTC_BUILD_NEON_LIBS Include test makefile Remove unused gnustl webrtc variants
2017-10-25Convert to Android.bpDan Willemsen
See build/soong/README.md for more information. Test: mmma external/webrtc Change-Id: I821fe8af5da246c7d93c2caee2b7e262a2c0ef53
2017-10-25Remove WEBRTC_BUILD_NEON_LIBSDan Willemsen
It doesn't work, and only complicates the Soong conversion (since it can't even be tested). It shouldn't be that hard to reimplement in Soong if we ever fix it. Test: mmma external/webrtc Change-Id: Ia5a23a6b7fb1ee17f7d9633016eb8ff73435b448
2017-10-25Include test makefileDan Willemsen
This wasn't being included by default, but it did build (so it would have been usable with 'mm' manually). Instead just always include it. Test: mmma external/webrtc Change-Id: Ibab5eaa1a2fac7ea7605fc3bef605c4663e8cc82
2017-10-25Remove unused gnustl webrtc variantsDan Willemsen
These aren't being used, and were complicating the makefiles. Test: cs/webrtc gnustl Change-Id: I256bc9da8e0dc89a11fda6a941a9cb43b8c0bb20
2017-08-10Merge "Suppress non-critical warnings in webrtc." am: cd56b9ddae am: ↵Chih-Hung Hsieh
60c71f62ea am: 3b894e682d am: ff04884918 am: d204c81fdc Change-Id: Icf9338a11a263cbae1f2058ab44b5bd680ac9df0
2017-08-10Merge "Suppress non-critical warnings in webrtc." am: cd56b9ddae am: ↵Chih-Hung Hsieh
60c71f62ea am: 3b894e682d am: ff04884918 Change-Id: Ibe9a4e93f253a1c0654b9eda127baefa483ff912
2017-08-10Merge "Suppress non-critical warnings in webrtc." am: cd56b9ddae am: 60c71f62eaChih-Hung Hsieh
am: 3b894e682d Change-Id: I8ebc7ef377ce2240280eb518cbd4fdf7b2e4df90
2017-08-10Merge "Suppress non-critical warnings in webrtc." am: cd56b9ddaeChih-Hung Hsieh
am: 60c71f62ea Change-Id: I6428edfc933480ad45511ac30409e291538012f6