aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-06-21DO NOT MERGE Add --srcjar option to mojom_source_generator.shandroid-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_r16pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-devpie-b4s4-releasepie-b4s4-devRyo Hashimoto
This is essentially a cherry-pick of https://android-review.googlesource.com/c/699550. Bug: 110444246 Test: build Change-Id: I7579f91c760a6b4380861390109a12298da2703d
2018-03-28libmojo: Add one more callback exception handlerpie-devLuis Hector Chavez
Upon further inspection, there is one more callback invocation site where we want to handle exceptions from. Bug: 28986534 Bug: 64805573 Bug: 73005146 Test: m Change-Id: I021ff2111e000eee4e9242afd87ad3b4420f6119 Merged-In: I021ff2111e000eee4e9242afd87ad3b4420f6119 (cherry picked from commit 41ea301886adf58cb6eb7aef138cc344af875ef9)
2018-02-21CleanSpec to clean up _bp am: 2dacff534e am: e375e4bb9aRisan
am: 79985a909d Change-Id: Id8f395758509ba22866fb6cbaab439eca5fc8602
2018-02-21CleanSpec to clean up _bp am: 2dacff534eRisan
am: e375e4bb9a Change-Id: I3d9c46349fb016f5f9d88cb72b07524341cc6871
2018-02-21CleanSpec to clean up _bpRisan
am: 2dacff534e Change-Id: Ibac18f9ba837b5295942e8e97251ca599f696766
2018-02-21Deprecate _bp suffix in libmojo am: b419a179fc am: 0ced94a956Risan
am: 6b52a324d0 Change-Id: Ic59bfa64df080d37f22b635e65f8602be4faab50
2018-02-21Deprecate _bp suffix in libmojo am: b419a179fcRisan
am: 0ced94a956 Change-Id: I3a00fb454372d284520ef2aa63f2bd75ac19ae47
2018-02-21Deprecate _bp suffix in libmojoRisan
am: b419a179fc Change-Id: I8d249bf04aefa604558d4fca3d00c83bd59dc0ef
2018-02-21CleanSpec to clean up _bpandroid-p-preview-1android-o-mr1-iot-preview-7o-mr1-iot-preview-7Risan
Bug: 72927715 Test: Compiled and observed that _bp libraries are removed. Change-Id: I04372c9012f2e2fda05a4013c0bb4193d8b330ad
2018-02-20Deprecate _bp suffix in libmojoRisan
This should be submitted after master _bp dependency cleaned ups are submitted. Bug: 72927715 Test: Compiled Change-Id: Icff5d776f6f8153486e0394260caee2c874b8cfa
2018-02-19Remove external/mojo makefiles am: c7e849876a am: 6d2fa6cd77Risan
am: b220bc7851 Change-Id: I08e983e0bf1a602f2dfef25dbae11d003dff2d19
2018-02-19Remove external/mojo makefiles am: c7e849876aRisan
am: 6d2fa6cd77 Change-Id: Icfd8086bf28801084143c238fa77ae375d446c71
2018-02-19Remove external/mojo makefilesRisan
am: c7e849876a Change-Id: I7223942a7888bd73e69e995af19fe630faf1f88e
2018-02-08Remove external/mojo makefilesRisan
They are not needed anymore after ag/3487491. Bug: 27569341 Test: make checkbuild -j40 in master gives the same error with and without this CL. Change-Id: Ib08ff421cd8e0634d18ee9cd87c342a936a40832
2018-02-07Add libmojo to mojo_binding import search dir am: 1db26454cf am: 7c5f10c51bRisan
am: 15b821c15a Change-Id: I9a4056425150ffa3520262f28cb7cd3423eaeb97
2018-02-06Add libmojo to mojo_binding import search dir am: 1db26454cfRisan
am: 7c5f10c51b Change-Id: I43eed0fb229d130c5811c13ce3492f3923f74119
2018-02-06Add libmojo to mojo_binding import search dirRisan
am: 1db26454cf Change-Id: Ia3d28d6fed8e9d8f4ef81fc872fc369be963f1e6
2018-02-07Add libmojo to mojo_binding import search dirRisan
This CL dispels the black magic previously used to link generated mojo sources/headers to external/libmojo. This allows ag/3559847. Bug: 72927715 Test: Compiled. Change-Id: I31cf7a510615c064370ed53ff55c10d76942e75b
2018-01-29Allow variable numbers of typemap in mojo generations am: 7db3d20fd6 am: ↵Risan
8be45534d6 am: 23451915dd Change-Id: I81603147407f2b24fb1532ea9997996683a956d7
2018-01-29Allow variable numbers of typemap in mojo generations am: 7db3d20fd6Risan
am: 8be45534d6 Change-Id: Icd61b9d49514cb11f8bced7886a91b8ac15613d7
2018-01-29Allow variable numbers of typemap in mojo generationsRisan
am: 7db3d20fd6 Change-Id: I3de66ece7512b00aa456b3d0990b216e53763717
2018-01-26Allow variable numbers of typemap in mojo generationsRisan
As example, device/google/cheets2/camera doesn't add additional typemap and libarcbrigge needs to have multiple typemaps. Bug: 27569341 Test: mmma -j32 external/libmojo (in AOSP branch), mmma -j32 device/google/cheets2/camera/mojo (in master), mmma -j32 vendor/google_arc/libs/libarcbridgeservice (in master). Change-Id: Ifb5e045c7dd8ec658dce7cb688e7ffaa71b837bb
2018-01-23Fix libmojo's incompatible mac bash script am: ceaad1adcb am: 9e41f46778Risan
am: 2ba28a6860 Change-Id: If91b310a223af494077db1ac3aab7735816c8740
2018-01-23Fix libmojo's incompatible mac bash script am: ceaad1adcbRisan
am: 9e41f46778 Change-Id: I184966e13393e1044b13ccf566d7e7a425ee645e
2018-01-23Fix libmojo's incompatible mac bash scriptRisan
am: ceaad1adcb Change-Id: Ia6bdfc77f81a98e8006697a4e28e8b31a5292e26
2018-01-24Fix libmojo's incompatible mac bash scriptandroid-wear-8.0.0_r1Risan
The real cause seems to be that Mac's bash script doesn't recognize "+" in regex comparison, but it recognizes "\+". Bug: 27569341 Test: Compiled successfully on Mac Change-Id: I74398f3aaf080b80c823b3bba3e5563604620a8d
2018-01-23[libmojo] Creates empty shared cc and h for Darwin am: 0ea99099ac am: 506498c869Risan
am: 7f1d5f9e06 Change-Id: I0dd8747dabba79413d086637e296474f42a49f17
2018-01-23[libmojo] Creates empty shared cc and h for Darwin am: 0ea99099acRisan
am: 506498c869 Change-Id: I5a68914c159d406a276514d3c359ba282dc4ccc6
2018-01-23[libmojo] Creates empty shared cc and h for DarwinRisan
am: 0ea99099ac Change-Id: I9611c6ecf644665e76e6a91136339ebd2a337801
2018-01-23[libmojo] Creates empty shared cc and h for DarwinRisan
This is a hack to unbreak Darwin targets, since for some reason mojo doesn't generate shared files for Darwin. Bug: 27569341 Test: Compiled on master (somehow AOSP is currently broken) Change-Id: I1f08baf1880cb334b99f4842b058362b3eee9256
2018-01-20Convert libmojo Java from Android.mk to use Android.bp am: d3b0199c83 am: ↵Risan
8bcfa7fd47 am: 00992a4b91 Change-Id: Ic7c62b6e58d8ae57298a8787b340711bc62dfeaf
2018-01-20Convert libmojo C++ to use Android.bp am: edc20e2864 am: d6de4bb2e0Risan
am: 29ac0b435b Change-Id: Ic4bb26e354b8ee9a2fcea75ffe07334344cc3a93
2018-01-20Convert libmojo Java from Android.mk to use Android.bp am: d3b0199c83Risan
am: 8bcfa7fd47 Change-Id: Ib4b72ddb7545fe3680112ad969e31da05ecdc779
2018-01-20Convert libmojo C++ to use Android.bp am: edc20e2864Risan
am: d6de4bb2e0 Change-Id: I12042eb31d51721426b41be768224eff344cedf3
2018-01-20Convert libmojo Java from Android.mk to use Android.bpRisan
am: d3b0199c83 Change-Id: I9bf1a28dd86ab02d12c0211663a647cf04727f7d
2018-01-20Convert libmojo C++ to use Android.bpRisan
am: edc20e2864 Change-Id: I3cf8d431ac9a513451ec9936f3c27cede58ff7fb
2018-01-19Convert libmojo Java from Android.mk to use Android.bpRisan
Bug: 27569341 Test: mmma -j32 external/libmojo Change-Id: I71a9cf98c210ddcc2cce53945ff0ebd2a608aaf6
2018-01-19Convert libmojo C++ to use Android.bpRisan
Patches from lhchavez@'s ag/318044. The Java generator is TODO. Bug: 27569341 Test: mmma -j32 external/libmojo Change-Id: Ifbbb7f2311a8877bc5d79ba45d98fc3e4da95d5c
2018-01-17Use importlib instead of imp in mojo_bindings_gen am: cf86eeff81 am: 12a14e874bRisan
am: 758a893e69 Change-Id: Ie647b0ab597bd85e089a0c70b8bce02fb2114eb4
2018-01-17Use importlib instead of imp in mojo_bindings_gen am: cf86eeff81Risan
am: 12a14e874b Change-Id: Idd38a1faf6abdc6e58be1678d19daced84930d2d
2018-01-17Use importlib instead of imp in mojo_bindings_genRisan
am: cf86eeff81 Change-Id: I013391f96f62e2e540fcfc104a3ec33ddbd0e60f
2018-01-18Use importlib instead of imp in mojo_bindings_genRisan
This is to fix incompatibillities issue with Android.bp. Bug: b:27569341 Test: Compile Change-Id: Ifa44950b7de01b27dfd266495fc88f820a7b6fc2 Reviewed-on: https://chromium-review.googlesource.com/865734 Reviewed-by: Yuzhu Shen <yzshen@chromium.org> Commit-Queue: Risan <risan@chromium.org> Cr-Commit-Position: refs/heads/master@{#529666}
2018-01-10libmojo: Support Time and TimeTicks typemap am: 359ef58a9d am: 85dd0fbd3aAbhishek Bhardwaj
am: eca3e8a8fc Change-Id: Id4740305a355e74551d520219129c0ade98ae351
2018-01-10libmojo: Support Time and TimeTicks typemap am: 359ef58a9dAbhishek Bhardwaj
am: 85dd0fbd3a Change-Id: I0ad445799f94b425f28fc850d64775d705149f2d
2018-01-10libmojo: Support Time and TimeTicks typemapAbhishek Bhardwaj
am: 359ef58a9d Change-Id: I7bce646644ae114b1e86405f111f069ef02cf001
2018-01-10libmojo: Support Time and TimeTicks typemapAbhishek Bhardwaj
This change adds the type mapping required to translate mojo Time / Ticks to base::Time / Ticks. Bug: None Test: Compiled the tree. Change-Id: Ic094458f362f22ccfd7beb1f7c8c702f2610dc65
2017-12-22libmojo: Add more objects to Chrome OS build am: 62aedeb1f7 am: 93186c8006Luis Hector Chavez
am: e714b8113a Change-Id: I69185f06db5c3687ce09e0c5caba30278e16d375
2017-12-22libmojo: Add more objects to Chrome OS build am: 62aedeb1f7Luis Hector Chavez
am: 93186c8006 Change-Id: I7dc53d88748e28c662e504ab51ab2253ee87a284
2017-12-22libmojo: Add more objects to Chrome OS buildLuis Hector Chavez
am: 62aedeb1f7 Change-Id: I3c76abaa36cfca522d7a59df90497f2c7e5ca5cf
2017-12-21libmojo: Add more objects to Chrome OS buildLuis Hector Chavez
This change adds the source file that contains mojo::internal::BindingStateBase and mojo::SyncCallRestrictions::AssertSyncCallAllowed to the Chrome OS build Bug: None Test: emerge-${BOARD} arc-oemcrypto # From Chrome OS Change-Id: I6ee44b19de38d312a38f61e91bd99d59126c8833