aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-30Merge "Update escaping in Android.bp files" am: d655f577be am: 0795213c78HEADandroid-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4sdk-releasenougat-iot-releasen-iot-preview-4mastermainColin Cross
am: edd2bafbb9 Change-Id: Iaa9da2c51abd844ea0e5baa2769f4e2c8a3762a1
2016-09-30Merge "Update escaping in Android.bp files" am: d655f577beColin Cross
am: 0795213c78 Change-Id: I57bc0bac3df0b51d810fa204a7ff8b23361545d2
2016-09-30Merge "Update escaping in Android.bp files"Colin Cross
am: d655f577be Change-Id: Icc8b9c4454880720f897628e78271ba168a79a5e
2016-09-30Merge "Update escaping in Android.bp files"Treehugger Robot
2016-09-29Update escaping in Android.bp filesColin Cross
Strings like cflags in Android.bp files are parsed by blueprint, written to build.ninja files, parsed by ninja, and then passed to /bin/sh -c. This had resulted in a combination of blueprint (\"), ninja ($$), and shell (\$) escaping being necessary. Soong has been updated to automatically handle ninja and shell escaping, remove extra escaping from Android.bp files. Bug: 31221587 Test: m -j Change-Id: I82ef0e976d8c22474e84abd100fb467a425fdff1
2016-08-02Merge "Convert Android.mk to Android.bp" am: 7ee95c3a50 am: 56698ebc6aDan Willemsen
am: d25479d1ed Change-Id: I6a6e39ea35a31b3771a17cbc89c2bb106b75a20d
2016-08-02Merge "Convert Android.mk to Android.bp" am: 7ee95c3a50Dan Willemsen
am: 56698ebc6a Change-Id: I714ca11333390df86e5dcc6134d9acad345f1c18
2016-08-02Merge "Convert Android.mk to Android.bp"Dan Willemsen
am: 7ee95c3a50 Change-Id: I24f4b076a5d79b0671d70e6e3659c44e0782a1ef
2016-08-02Merge "Convert Android.mk to Android.bp"Dan Willemsen
2016-07-31Convert Android.mk to Android.bpDan Willemsen
Change-Id: Iac0170f22d3bb3527505b015c61d811b0bbcdb47
2016-05-12Merge "Merge "Android doesn\'t really have <sys/syslimits.h>." am: ↵Android Build Merger (Role)
282db28ba0 am: 99861335b2 am: 111eb3eb19 am: fd633e6cc9 am: f912f5c8f9 am: 0dc3922511 am: f6efe701f1" into nyc-mr1-dev-plus-aosp
2016-05-12Merge "Android doesn\'t really have <sys/syslimits.h>." am: 282db28ba0 am: ↵Elliott Hughes
99861335b2 am: 111eb3eb19 am: fd633e6cc9 am: f912f5c8f9 am: 0dc3922511 am: 9c0277f9e7 * commit '9c0277f9e76271275925b13db5ebcf7584d29f98': Merge "Android doesn\'t really have <sys/syslimits.h>." am: 282db28ba0 am: 99861335b2 am: 111eb3eb19 am: fd633e6cc9 am: f912f5c8f9 Change-Id: I89dfe9ae9d55c3402330670e00784c4f97cabef2
2016-05-12Merge "Android doesn\'t really have <sys/syslimits.h>." am: 282db28ba0 am: ↵Elliott Hughes
99861335b2 am: 111eb3eb19 am: fd633e6cc9 am: f912f5c8f9 am: 0dc3922511 am: f6efe701f1 * commit 'f6efe701f17e9cb7b03e197fea6125617859e497': Merge "Android doesn\'t really have <sys/syslimits.h>." am: 282db28ba0 am: 99861335b2 am: 111eb3eb19 am: fd633e6cc9 am: f912f5c8f9 Change-Id: I2ef5c46647bd2c96e8bba7dc99b57311e9a79d70
2016-05-12Merge "Android doesn\'t really have <sys/syslimits.h>." am: 282db28ba0 am: ↵Elliott Hughes
99861335b2 am: 111eb3eb19 am: fd633e6cc9 am: f912f5c8f9 am: 0dc3922511 * commit '0dc3922511f6be0063bd0f11ac43173f5bb2d4a2': Merge "Android doesn\'t really have <sys/syslimits.h>." am: 282db28ba0 am: 99861335b2 am: 111eb3eb19 am: fd633e6cc9 am: f912f5c8f9 Change-Id: Ie31a10ceea2b17f2956eb3b86fe2b3045d00f09e
2016-05-12Merge "Android doesn\'t really have <sys/syslimits.h>." am: 282db28ba0 am: ↵android-wear-n-preview-2android-wear-7.1.1_r1android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-wear-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releaseElliott Hughes
99861335b2 am: 111eb3eb19 am: fd633e6cc9 am: f912f5c8f9 am: 0dc3922511 * commit '0dc3922511f6be0063bd0f11ac43173f5bb2d4a2': Merge "Android doesn\'t really have <sys/syslimits.h>." am: 282db28ba0 am: 99861335b2 am: 111eb3eb19 am: fd633e6cc9 am: f912f5c8f9 Change-Id: Ieec5a044d9290a63b692a0ab8f489c8417e495d4
2016-05-12Merge "Android doesn\'t really have <sys/syslimits.h>." am: 282db28ba0 am: ↵android-n-iot-preview-2android-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-devnougat-cts-releasenougat-bugfix-releasen-iot-preview-2Elliott Hughes
99861335b2 am: 111eb3eb19 am: fd633e6cc9 am: f912f5c8f9 * commit 'f912f5c8f9ff08d11022f87f3b3943e953aa4faa': Android doesn't really have <sys/syslimits.h>. Change-Id: Ib86acbcc9e496c30887af93698542a051658653e (cherry picked from commit 21d659ab26e4dbdbdcddd24346ece75451ccfae1) BUG: 28704419
2016-04-29Merge "Android doesn\'t really have <sys/syslimits.h>." am: 282db28ba0 am: ↵Elliott Hughes
99861335b2 am: 111eb3eb19 * commit '111eb3eb19c8ce3301d15dc9bcf972c24754981a': Android doesn't really have <sys/syslimits.h>. Change-Id: I31b8674b70e392da01a7194d8b83e5f0870a69e1
2016-04-29Merge "Android doesn\'t really have <sys/syslimits.h>." am: 282db28ba0Elliott Hughes
am: 99861335b2 * commit '99861335b28838d844dc8864b5bd1ea48a035c2a': Android doesn't really have <sys/syslimits.h>. Change-Id: Icba0704b488adef6c54c68c6abcd5feca30e0d11
2016-04-29Merge "Android doesn\'t really have <sys/syslimits.h>."Elliott Hughes
am: 282db28ba0 * commit '282db28ba048ccaf956b208ab6059ff288c3d74b': Android doesn't really have <sys/syslimits.h>. Change-Id: I531895563641c54984a72b08d49bf389bc445798
2016-04-29Merge "Android doesn't really have <sys/syslimits.h>."Treehugger Robot
2016-04-29Android doesn't really have <sys/syslimits.h>.Elliott Hughes
We have had an empty file until now, but that's just lying to configure. Bug: http://b/28432688 Change-Id: Idd893d1fcfcbd42c5661f18259a508e9ded1d7cc
2015-12-21Merge "dbus: Raise SIGTERM when the connection drops."android-wear-n-preview-3android-wear-n-preview-1android-n-preview-2android-n-preview-1n-preview-2n-preview-1Bertrand Simonnet
am: 81bb11fbf7 * commit '81bb11fbf713adcf28aeb5c5fb3430a58fe4e6f1': dbus: Raise SIGTERM when the connection drops.
2015-12-21Merge "dbus: Raise SIGTERM when the connection drops."brillo-m9-releasebrillo-m9-devbrillo-m10-releasebrillo-m10-devBertrand Simonnet
2015-12-18dbus: Raise SIGTERM when the connection drops.Bertrand SIMONNET
Instead of exiting directly when a client notices that the connection got dropped, raise a SIGTERM signal to allow the client to clean up and exit cleanly. Bug: 26267381 Test: stop dbus. Clients exit cleanly. Change-Id: I7e1faf1aa8b761b1b05dfde82a48882f61124acb
2015-10-22Merge "Enable HAVE_MONOTONIC_CLOCK compiler flag"Peter Qiu
am: beeafcd9a0 * commit 'beeafcd9a08682077dc086fe1d96dee6f3b60fd2': Enable HAVE_MONOTONIC_CLOCK compiler flag
2015-10-22Merge "Enable HAVE_MONOTONIC_CLOCK compiler flag"brillo-m8-releasebrillo-m8-devbrillo-m7-releasebrillo-m7-mr-devbrillo-m7-devPeter Qiu
2015-10-22Enable HAVE_MONOTONIC_CLOCK compiler flagPeter Qiu
This will make D-Bus use monotonic clock instead of system time for timeout calculation, which prevents issues when system time changes while there is a pending call. Bug: 25159392 TEST=Manual test on Brillo boards Change-Id: I2f4f1ea4848b47efe10b56efe02b2c7c9b33f779
2015-08-21am 7d83c132: am 43693538: Merge "dbus-send: Move from /system/xbin to ↵Steve Fung
/system/bin" * commit '7d83c1324aa90dce0f20545358de6d3c2795d5c8': dbus-send: Move from /system/xbin to /system/bin
2015-08-21am 43693538: Merge "dbus-send: Move from /system/xbin to /system/bin"Steve Fung
* commit '4369353844e7f4daadce9396907c6fcf35ea220c': dbus-send: Move from /system/xbin to /system/bin
2015-08-21Merge "dbus-send: Move from /system/xbin to /system/bin"Steve Fung
2015-08-20dbus-send: Move from /system/xbin to /system/binSteve Fung
Since dbus-send is required for our system, move it from the optional xbin folder to the main bin folder. Bug: 22874832 Change-Id: I2f8bf4a08d1f6684cdcb365180968ba966fc4848
2015-07-16am f3119b50: am d0f456e0: Merge "Fix LOCAL_EXPORT_C_INCLUDE_DIRS for dbus ↵Daniel Erat
subdirectory." * commit 'f3119b5003d319a80a6a316c7def8353fef0f776': Fix LOCAL_EXPORT_C_INCLUDE_DIRS for dbus subdirectory.
2015-07-16am d0f456e0: Merge "Fix LOCAL_EXPORT_C_INCLUDE_DIRS for dbus subdirectory."Daniel Erat
* commit 'd0f456e05fbffd006eabe3daf5cc64b122345315': Fix LOCAL_EXPORT_C_INCLUDE_DIRS for dbus subdirectory.
2015-07-16Merge "Fix LOCAL_EXPORT_C_INCLUDE_DIRS for dbus subdirectory."Daniel Erat
2015-07-15Fix LOCAL_EXPORT_C_INCLUDE_DIRS for dbus subdirectory.Daniel Erat
libdbus's headers are typically included as e.g. <dbus/dbus.h>, so the dbus/ subdirectory should export its parent directory instead of itself. Also add dbus/dbus-misc.c to the list of source files so libchrome can call dbus_get_version(). Bug: 22328216 Change-Id: Ie4a7f2f9a937743ebed54e8c1067beb406ecd0ba
2015-07-13am 57190838: am 7330e092: Merge "Remove eng tags."Ying Wang
* commit '571908380474f7ca02050a8519784f9583e3c746': Remove eng tags.
2015-07-13am 7330e092: Merge "Remove eng tags."Ying Wang
* commit '7330e092f3048df161495780270b1be8cbd857b0': Remove eng tags.
2015-07-13Merge "Remove eng tags."Ying Wang
2015-07-10Remove eng tags.Ying Wang
With eng tag, these modules are built and installed in all eng builds. Change-Id: Iac12d03b262c0a13645ecae87882677c1db9f4bf
2015-07-10am 552efb6c: am ba9259af: Merge "Set LOCAL_CLANG to true."Daniel Erat
* commit '552efb6c7b8305e161f4284b37cb756e6bd112ac': Set LOCAL_CLANG to true.
2015-07-09am ba9259af: Merge "Set LOCAL_CLANG to true."Daniel Erat
* commit 'ba9259af931b0aae441bc5542a5b9c530f97a559': Set LOCAL_CLANG to true.
2015-07-09Merge "Set LOCAL_CLANG to true."Daniel Erat
2015-07-09Set LOCAL_CLANG to true.Daniel Erat
Bug: 22328216 Change-Id: I1ae55578b217fd743dad52cc57c90cc11c8a098b
2015-07-09am de7f8a61: am f0f2aaa9: Merge "Incorporate upstream changes to v1.6.8."Daniel Erat
* commit 'de7f8a61ae8c5141262ad00f7ae1e61baa41c59c': Incorporate upstream changes to v1.6.8.
2015-07-09am f0f2aaa9: Merge "Incorporate upstream changes to v1.6.8."Daniel Erat
* commit 'f0f2aaa99e24ea9044b5ffac8f60c53010355c7c': Incorporate upstream changes to v1.6.8.
2015-07-09Merge "Incorporate upstream changes to v1.6.8."Daniel Erat
2015-07-09Incorporate upstream changes to v1.6.8.Daniel Erat
Squash upstream commits up to and including the v1.6.8 release (upstream commit 1cad15cc). This repository's changes from upstream are now limited to: - addition of Android.mk, CleanSpec.mk, config.h, and NOTICE files - addition of dbus/dbus-arch-deps.h and removal from dbus/.gitignore (ebae2d21, f022f55d) - WANT_PIDFILE #ifdefs added to bus/bus.c to disable writing dbus-daemon's PID to a file (3100d06a) - TRACE_LOCKS set to 0 in dbus/dbus-connection.c (88a0ffe5) - DBUS_ANDROID_LOG added to dbus/dbus-internals.c to use logcat (7de15def) - ANDROID_MANAGED_SOCKET added to dbus/dbus-sysdeps-unix.c to use an SELinux-managed socket rather than a dbus-daemon-created Unix domain socket (3100d06a) Bug: 22328216 Change-Id: I793ebdf963d9b0740f0da28f1de593d088f08406
2015-07-09am 74f6b33e: am 22d8c0ed: Merge "Minor build cleanup."Daniel Erat
* commit '74f6b33e54eb4e252004db611e12da6ffbad6f1c': Minor build cleanup.
2015-07-09am 22d8c0ed: Merge "Minor build cleanup."Daniel Erat
* commit '22d8c0edd356c2ee24c520661f4570330a849a48': Minor build cleanup.
2015-07-09Merge "Minor build cleanup."Daniel Erat
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 08:40:48 +0000