summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-02-07merge in nyc-release history after reset to masterandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-cts-releasenougat-bugfix-releaseThe Android Automerger
2016-02-04libchrome_test: Compile only on \'eng\' builds. am: 5d0701ee9dnougat-devJorge Lucangeli Obes
am: 8508936936 * commit '8508936936ce4cea206374f106a34c5301a6d52b': libchrome_test: Compile only on 'eng' builds.
2016-02-04libchrome_test: Compile only on \'eng\' builds.Jorge Lucangeli Obes
am: 5d0701ee9d * commit '5d0701ee9dbfad58a2a4f3bc9c77cc07156eeee5': libchrome_test: Compile only on 'eng' builds.
2016-02-04libchrome_test: Compile only on 'eng' builds.Jorge Lucangeli Obes
Bug: 26967770 Change-Id: I12415d187e1985b814b2c0c3307e688b9ed2f5d9
2016-02-04merge in nyc-release history after reset to masterThe Android Automerger
2016-02-03Add libchrome-crypto to the Makefile. am: 602804efdeDarren Krahn
am: 92af549b80 * commit '92af549b8048ff7816d18b335c79cac1089e24ef': Add libchrome-crypto to the Makefile.
2016-02-03Add libchrome-crypto to the Makefile.Darren Krahn
am: 602804efde * commit '602804efded144af970140446c5010aeacd5c4a5': Add libchrome-crypto to the Makefile.
2016-02-03Add libchrome-crypto to the Makefile.Darren Krahn
Also add minor fixes to get the build working with boringssl. BUG=25746269 Change-Id: I4af9850a48a813c1310d7eb7596f7ef79812a57e
2016-02-03merge in nyc-release history after reset to masterThe Android Automerger
2016-02-02Remove no-compile tests from LOCAL_SRC_FILES am: 933451c3ffDan Willemsen
am: 04b83cf1e4 * commit '04b83cf1e43b8989a0519ced20e91c423063c121': Remove no-compile tests from LOCAL_SRC_FILES
2016-02-02Remove no-compile tests from LOCAL_SRC_FILESDan Willemsen
am: 933451c3ff * commit '933451c3ff475cafa8d35b63d921334023b7de3b': Remove no-compile tests from LOCAL_SRC_FILES
2016-01-26merge in nyc-release history after reset to masterThe Android Automerger
2016-01-25Remove no-compile tests from LOCAL_SRC_FILESDan Willemsen
The android build system does not support no-compile tests - these files were silently skipped when compiling. Remove them from LOCAL_SRC_FILES so that it does not appear that they work. Unused files in LOCAL_SRC_FILES are being turned into warnings to catch typos. Change-Id: I311f7ebd3f2542cdee3c4e87c04065c67bc53c0e
2016-01-25libchrome: Add files needed by some veyron variants on Chrome OS am: 1ac3a5e3e1Alex Vakulenko
am: 7555b4a0e6 * commit '7555b4a0e682456898a7d628286978b5fc5de3e4': libchrome: Add files needed by some veyron variants on Chrome OS
2016-01-25libchrome: Add files needed by some veyron variants on Chrome OSAlex Vakulenko
am: 1ac3a5e3e1 * commit '1ac3a5e3e15a0a3db48c4cb13736ce38033831fe': libchrome: Add files needed by some veyron variants on Chrome OS
2016-01-25libchrome: Add files needed by some veyron variants on Chrome OSAlex Vakulenko
These files are needed for Chrome IPC. These will be compiled on Chrome OS, so no impact on AOSP. BUG: 26772882 TEST: make -j32 for dragonboard ./build_packages on CrOS for various boards. Change-Id: Ibca0a04692a59f245cab2d5c9707cff109ca144f
2016-01-24merge in nyc-release history after reset to masterThe Android Automerger
2016-01-23libchrome: Fix libchrome build on Chrome OS am: 24854748fbAlex Vakulenko
am: 6f0e280039 * commit '6f0e280039b67bb2c90ef7ea80252c63744be324': libchrome: Fix libchrome build on Chrome OS
2016-01-23libchrome: Revert deleted files needed by Chrome OS am: f6024733c0Alex Vakulenko
am: 1747478d39 * commit '1747478d39a8f1dca076c59cd6a25f7400d5bb10': libchrome: Revert deleted files needed by Chrome OS
2016-01-23libchrome: Fix libchrome build on Chrome OSAlex Vakulenko
am: 24854748fb * commit '24854748fba09df2a29f0d08d558c3acea70e7a1': libchrome: Fix libchrome build on Chrome OS
2016-01-23libchrome: Revert deleted files needed by Chrome OSAlex Vakulenko
am: f6024733c0 * commit 'f6024733c0d1eed88f68520b5e6a20b96e212ad6': libchrome: Revert deleted files needed by Chrome OS
2016-01-22libchrome: Fix libchrome build on Chrome OSAlex Vakulenko
Applying libchrome r369476 changes to Chrome OS-only files from the upstream of libchrome (from Chromium). Also modified SConstruct to add new files and remove deleted files. Change-Id: Id22160e32d19b0bb228903e3df372fb82550626c
2016-01-22libchrome: Revert deleted files needed by Chrome OSAlex Vakulenko
Some of the "unused" files were apparently needed for building libchrome on Chrome OS. Reverting deletion of these files. Change-Id: I02e32f112d16480206f43ca0087342a9de7f1e1b
2016-01-22libchrome: Fix Mac buildAlex Vakulenko
The recent uprev attempt missed a couple Mac-specific files. Adding them now. Also, there were some other build breaks in Mac files. Particularly, had to revert the uprev change to the following file base/message_loop/message_pump_mac.mm because the change relied on base::mac::CallWithEHFrame() which was implemented in assembly and didn't compile on 32 bit platform. So, I have removed the change introduced with https://codereview.chromium.org/1212093002 on Chromium side. Change-Id: Ic78acbb22732e64965f99ce31bc8382f228e22bb
2016-01-22Set default USE flags values as local variables. am: 340b8dd38cAlex Deymo
am: 746bfb6d43 * commit '746bfb6d43a8e9eb4a8c4a5df8aeff2d8db3fa5a': Set default USE flags values as local variables.
2016-01-22Set default USE flags values as local variables.Alex Deymo
am: 340b8dd38c * commit '340b8dd38ca56de409ca4f790b45b1c314c544dd': Set default USE flags values as local variables.
2016-01-21Set default USE flags values as local variables.Alex Deymo
Setting variables such as BRILLO_USE_FOO can leak to other makefiles, so the local default value set by another project can affect the default behavior. This patch defines local variables with the local default value for the USE flags. Bug: None TEST=mmma external/libchrome Change-Id: Ic383a40a84dd9cc8ab88ef37a6a4d173129db771
2016-01-21libchrome: Fix Mac build am: 42b71bb1f5Alex Vakulenko
am: 51ebf91ce0 * commit '51ebf91ce04d2def5d07e3d2716153c9fe6eb423': libchrome: Fix Mac build
2016-01-21libchrome: Fix Mac buildAlex Vakulenko
am: 42b71bb1f5 * commit '42b71bb1f5e3181432118923284adf294524d3d8': libchrome: Fix Mac build
2016-01-20libchrome: Fix Mac buildAlex Vakulenko
The recent uprev attempt missed a couple Mac-specific files. Adding them now. Also, there were some other build breaks in Mac files. Particularly, had to revert the uprev change to the following file base/message_loop/message_pump_mac.mm because the change relied on base::mac::CallWithEHFrame() which was implemented in assembly and didn't compile on 32 bit platform. So, I have removed the change introduced with https://codereview.chromium.org/1212093002 on Chromium side. Change-Id: Ic78acbb22732e64965f99ce31bc8382f228e22bb
2016-01-21Restore MessagePumpGlib files am: 8103ab12a4Alex Vakulenko
am: 06f23ba4b6 * commit '06f23ba4b62cb691f7a0e6f64325eb596aa6890c': Restore MessagePumpGlib files
2016-01-21libchrome: Uprev the library to r369476 from Chromium am: 0d205d712aAlex Vakulenko
am: 04545cea8d * commit '04545cea8d8585533c5d512e87c38d8058b8eca1': libchrome: Uprev the library to r369476 from Chromium
2016-01-21libchrome: Fix Android.mk file list am: b7972fa941Alex Vakulenko
am: 7fa021ce69 * commit '7fa021ce69f375458aa39fd2b54c24ef42b5574e': libchrome: Fix Android.mk file list
2016-01-21libchrome: Delete unused source files am: fc6fa02470Alex Vakulenko
am: 4522b20198 -s ours * commit '4522b201989ad158f2ed6d8f989e769f3979a2c8': libchrome: Delete unused source files
2016-01-21Restore MessagePumpGlib filesAlex Vakulenko
am: 8103ab12a4 * commit '8103ab12a472dbb30df17d4ac98fa78d976ec00b': Restore MessagePumpGlib files
2016-01-20Restore MessagePumpGlib filesAlex Vakulenko
These are apparently used on Chrome OS and were deleted from AOSP by mistake... Recovering. Change-Id: I257eee62a27d1dbb6029c776ac56af78ca110213
2016-01-21libchrome: Uprev the library to r369476 from ChromiumAlex Vakulenko
am: 0d205d712a * commit '0d205d712abd16eeed2f5d5b1052a367d23a223f': libchrome: Uprev the library to r369476 from Chromium
2016-01-21libchrome: Fix Android.mk file listAlex Vakulenko
am: b7972fa941 * commit 'b7972fa941a92a43e7ed703ab262afeb7bcc2a5a': libchrome: Fix Android.mk file list
2016-01-21libchrome: Delete unused source filesAlex Vakulenko
am: fc6fa02470 * commit 'fc6fa02470e7d005f9492d41d4a149e4f61c24d1': libchrome: Delete unused source files
2016-01-21Merge "libchrome: Fix Android.mk file list"Ian Pedowitz
2016-01-20libchrome: Uprev the library to r369476 from ChromiumAlex Vakulenko
Pulled the latest and greatest version of libchrome from Chromium. The merge was done against r369476 which corresponds to git commit 0471d0e2e2ef4a544a63481a389e1df33ea7c00a of Jan 14, 2016 Notable changes are: - base::scoped_ptr<T> is now almost identical to std::unique_ptr<T> No Pass() method, now std::move() is used on scoped pointers - basictypes.h is removed and custom int types such as int32 are now replaced with the standard int32_t and similar from <stdint.h> - String utility functions are cleaned up/refactored. Now all are in base:: namespace, many now return values rather than take pointers for results, ambiguous Booleans are replaced with enums, such as: base::StartsWithASCII(current_url, "https://", false); now is: base::StartsWith(current_url, "https://", base::CompareCase::INSENSITIVE_ASCII); - COMPILE_ASSERT() is now replaced with standard static_assert() - Numeric range constants such as kuint64max are removed in favor of standard <limits> constructs such as std::numeric_limits<uint64_t>::max() - base::Value and derived classes use scoped_ptr<> more and support for raw pointers to base::Value is deprecated and/or removed in many places. - base::MessageLoopProxy is completely removed (was marked deprecated before) - base::MessageLoop::Quit() and QuitClosure are renamed to QuitWhenIdle and QuitWhenIdleClosure for more semantic clarity. (cherry picked from commit 0d205d712abd16eeed2f5d5b1052a367d23a223f) Change-Id: I4fb67d80eacd03186868c12c9509189d184e00bd
2016-01-20libchrome: Delete unused source filesAlex Vakulenko
In order to help with uprev maintenance, remove all the source files that are not being built on AOSP/ChromeOS (cherry picked from commit fc6fa02470e7d005f9492d41d4a149e4f61c24d1) Change-Id: I1397013be4e4371abf0400d1fd1418549f5f239f
2016-01-20libchrome: Fix Android.mk file listAlex Vakulenko
There were a few minor errors in source file list for the library's make file (missing extension, etc) and some unit tests were not compiling for sources that were included. (cherry picked from commit b7972fa941a92a43e7ed703ab262afeb7bcc2a5a) Change-Id: I9a42d3bbc1864fa24678ac66b28e0b3018cb4e73
2016-01-20libchrome: Uprev the library to r369476 from ChromiumAlex Vakulenko
Pulled the latest and greatest version of libchrome from Chromium. The merge was done against r369476 which corresponds to git commit 0471d0e2e2ef4a544a63481a389e1df33ea7c00a of Jan 14, 2016 Notable changes are: - base::scoped_ptr<T> is now almost identical to std::unique_ptr<T> No Pass() method, now std::move() is used on scoped pointers - basictypes.h is removed and custom int types such as int32 are now replaced with the standard int32_t and similar from <stdint.h> - String utility functions are cleaned up/refactored. Now all are in base:: namespace, many now return values rather than take pointers for results, ambiguous Booleans are replaced with enums, such as: base::StartsWithASCII(current_url, "https://", false); now is: base::StartsWith(current_url, "https://", base::CompareCase::INSENSITIVE_ASCII); - COMPILE_ASSERT() is now replaced with standard static_assert() - Numeric range constants such as kuint64max are removed in favor of standard <limits> constructs such as std::numeric_limits<uint64_t>::max() - base::Value and derived classes use scoped_ptr<> more and support for raw pointers to base::Value is deprecated and/or removed in many places. - base::MessageLoopProxy is completely removed (was marked deprecated before) - base::MessageLoop::Quit() and QuitClosure are renamed to QuitWhenIdle and QuitWhenIdleClosure for more semantic clarity. Change-Id: I1f5436d253a0a32b2299160a76993752d818736f
2016-01-20libchrome: Fix Android.mk file listAlex Vakulenko
There were a few minor errors in source file list for the library's make file (missing extension, etc) and some unit tests were not compiling for sources that were included. Change-Id: I8bc8a07a342d089a3e9d3e4cbb96334b4ab718cc
2016-01-20libchrome: Delete unused source filesAlex Vakulenko
In order to help with uprev maintenance, remove all the source files that are not being built on AOSP/ChromeOS Change-Id: Iec3221ae8aa02a17326949085b33925382968673
2016-01-07ChromeOS: Don\'t abort when the dbus connection drops. am: da04820d4fBertrand SIMONNET
am: ace4e8f76a * commit 'ace4e8f76ad144796460dc142f7285603b9270b5': ChromeOS: Don't abort when the dbus connection drops.
2016-01-07ChromeOS: Don\'t abort when the dbus connection drops.Bertrand SIMONNET
am: da04820d4f * commit 'da04820d4f6c808cc997a3957be0aad62c4f3fd2': ChromeOS: Don't abort when the dbus connection drops.
2016-01-06ChromeOS: Don't abort when the dbus connection drops.brillo-m9-releasebrillo-m9-devBertrand SIMONNET
We don't abort when the dbus bus disconnects on Android, we should do the same on Chrome OS. Bug: 26267381 Change-Id: I7b4060e91c89916fdaca33a617cdcae6c98e21e3
2016-01-05Export gtest headers from libchrome am: b22b2857a4Christopher Wiley
am: 4706432405 * commit '4706432405b8689025da9f7f1155ded4f4b44e76': Export gtest headers from libchrome