Commit graph

18829 commits

Author SHA1 Message Date
Automerger Merge Worker
bb1ce92ed7 Merge "Dedup cc build components registration" am: 4565aba98c am: 60e17ae445 am: 7b59c5f316
Change-Id: I13e16f00844873614440fd4270f7023271df1caa
2019-12-20 02:50:52 +00:00
Automerger Merge Worker
15461e8216 Merge "Improve cc tests by adding fuzzer mutators" am: de85fa9f5f am: c2acb75a92 am: d4ab3052ff
Change-Id: I4fb978543a4985587762892304c73f1c62de613a
2019-12-20 02:50:37 +00:00
Automerger Merge Worker
4e965ebbce Merge "Improve cc tests by adding sanitizer mutators" am: 7d211f1793 am: 152b5f8675 am: 5b91dc8d39
Change-Id: Ife351bc2628c32e7473ead96097b6ebd325604ec
2019-12-20 02:50:24 +00:00
Automerger Merge Worker
504b300fc6 Merge "Dedup prebuilt mutator registration" am: 82f4f99780 am: 849e8f7509 am: e05577b9a8
Change-Id: I094959ab23674cafcc40455f5ea1c062085c75f1
2019-12-20 02:50:06 +00:00
Automerger Merge Worker
598e0885e7 Merge "Dedup registration for cc default test config" am: 24de9ea201 am: 6da6395f16 am: 1971acf840
Change-Id: Iff72ebfc46ba03e5b9a26ba04e6810f720747bc7
2019-12-20 02:48:49 +00:00
Automerger Merge Worker
7b59c5f316 Merge "Dedup cc build components registration" am: 4565aba98c am: 60e17ae445
Change-Id: Id755b57a8fe30e5228c9426ea80170be33907363
2019-12-20 01:45:21 +00:00
Automerger Merge Worker
d4ab3052ff Merge "Improve cc tests by adding fuzzer mutators" am: de85fa9f5f am: c2acb75a92
Change-Id: Ibbb2da0a79a4531ed52fd31b01bb896fb5877a2c
2019-12-20 01:44:56 +00:00
Automerger Merge Worker
5b91dc8d39 Merge "Improve cc tests by adding sanitizer mutators" am: 7d211f1793 am: 152b5f8675
Change-Id: I7cb71d3f3875f32aec811a8a87f969e8136296a6
2019-12-20 01:44:44 +00:00
Automerger Merge Worker
e05577b9a8 Merge "Dedup prebuilt mutator registration" am: 82f4f99780 am: 849e8f7509
Change-Id: I1d7d944bf38c1e50b6617390014113f08ae10d2b
2019-12-20 01:44:28 +00:00
Automerger Merge Worker
1971acf840 Merge "Dedup registration for cc default test config" am: 24de9ea201 am: 6da6395f16
Change-Id: I51386821d0372047f5b7cfd3b6f11e79ed28c2ac
2019-12-20 01:44:07 +00:00
Paul Duffin
60e17ae445 Merge "Dedup cc build components registration"
am: 4565aba98c

Change-Id: Ib77c533dc0eff2bd4e712dcf62720115482bcc5f
2019-12-19 17:32:31 -08:00
Paul Duffin
c2acb75a92 Merge "Improve cc tests by adding fuzzer mutators"
am: de85fa9f5f

Change-Id: Iba83ff227e9d7e05dc297ae65da073acd53a32d8
2019-12-19 17:32:16 -08:00
Jaewoong Jung
7abcf8ead8 Make apex.overrides overridable by override_apex.
Test: apex_test.go
Change-Id: Id47e5e5bec45ec1ada68f9d2d806585c5141a2f9
2019-12-19 17:32:06 -08:00
Paul Duffin
152b5f8675 Merge "Improve cc tests by adding sanitizer mutators"
am: 7d211f1793

Change-Id: I76d388338356a4ea6c92fae15964c53de4797ded
2019-12-19 17:32:05 -08:00
Paul Duffin
849e8f7509 Merge "Dedup prebuilt mutator registration"
am: 82f4f99780

Change-Id: Ib446dfe5f0b007969c19b9fbb2eff47dee77b5ee
2019-12-19 17:31:44 -08:00
Paul Duffin
6da6395f16 Merge "Dedup registration for cc default test config"
am: 24de9ea201

Change-Id: Ibdb48541f9c5ce29f994c3f28311b20cd672d457
2019-12-19 17:30:21 -08:00
Treehugger Robot
4565aba98c Merge "Dedup cc build components registration" 2019-12-20 01:27:00 +00:00
Treehugger Robot
de85fa9f5f Merge "Improve cc tests by adding fuzzer mutators" 2019-12-20 01:26:01 +00:00
Treehugger Robot
7d211f1793 Merge "Improve cc tests by adding sanitizer mutators" 2019-12-20 01:25:56 +00:00
Treehugger Robot
82f4f99780 Merge "Dedup prebuilt mutator registration" 2019-12-20 01:25:51 +00:00
Treehugger Robot
24de9ea201 Merge "Dedup registration for cc default test config" 2019-12-20 01:25:42 +00:00
Jeff Sharkey
2123b96921 Merge "Move MediaStore.java inside APEX boundary." 2019-12-20 01:17:46 +00:00
Automerger Merge Worker
200ec5ad57 Merge "Switch to toybox realpath." am: 936a18d8da am: 839758822a am: 208275188e
Change-Id: I6c8f483962b61575e6232ea9a9fd60ea49e2eec7
2019-12-20 00:58:13 +00:00
Automerger Merge Worker
600da8d03f Merge "Rollback to the legacy way of computing boot image locations." am: 3b56e37f19 am: 4245d29627 am: c52c916164
Change-Id: I2b5ec72b071d1437afd575a6d9d191d3e4429f91
2019-12-20 00:57:51 +00:00
Automerger Merge Worker
208275188e Merge "Switch to toybox realpath." am: 936a18d8da am: 839758822a
Change-Id: I359007c68a34d1168ed18b3441c358dfbb78ad51
2019-12-20 00:42:14 +00:00
Automerger Merge Worker
c52c916164 Merge "Rollback to the legacy way of computing boot image locations." am: 3b56e37f19 am: 4245d29627
Change-Id: Ib6d839af14aae1cdad166a8434f7aa3ea43f0ee7
2019-12-20 00:41:53 +00:00
Elliott Hughes
839758822a Merge "Switch to toybox realpath."
am: 936a18d8da

Change-Id: Ia21f6e60b1dd69686a1df78de4c2842866b8246b
2019-12-19 16:33:15 -08:00
Elliott Hughes
936a18d8da Merge "Switch to toybox realpath." 2019-12-20 00:27:10 +00:00
Ulyana Trafimovich
4245d29627 Merge "Rollback to the legacy way of computing boot image locations."
am: 3b56e37f19

Change-Id: I3528c0080d86a5387caf4fd508b2136db86c9692
2019-12-19 16:26:58 -08:00
Automerger Merge Worker
08666fd06c [automerger skipped] DO NOT MERGE: Add tradefed_java_library_host am: cba45b2892 am: 4f2eeaba4e am: 5df94fa457 -s ours am: 2b9a084e46 -s ours
am skip reason: subject contains skip directive

Change-Id: I599c32f1951736ca36d26018a00c28a34ed8e727
2019-12-20 00:17:24 +00:00
Automerger Merge Worker
5cd828634e [automerger skipped] DO NOT MERGE: Add tradefed_java_library_host am: 853f5c9edd am: f8e1fca17b -s ours am: fcce7ed08f -s ours
am skip reason: subject contains skip directive

Change-Id: If97f4666c8615eca2223748d0824f954c17cb988
2019-12-20 00:16:55 +00:00
Changyeon Jo
96279252d7 Generate Compdb file in the output directory
This change modifies the location of generated compdb file from
$ANDROID_BUILD_TOP to where compdbOtuputProjectsDirectory points to,
under $OUT_DIR.  This is especially required for the build environment
that maps $ANDROID_BUILD_TOP as read-only, such as Gitc.

Test: m SOONG_GEN_COMPDB=1 nothing
      examine generated compile_commands.json
Signed-off-by: Changyeon Jo <changyeon@google.com>

Change-Id: I86700f89b613a443a33982ecd5501b0f68a62be7
2019-12-20 00:10:02 +00:00
Automerger Merge Worker
2b9a084e46 [automerger skipped] DO NOT MERGE: Add tradefed_java_library_host am: cba45b2892 am: 4f2eeaba4e am: 5df94fa457 -s ours
am skip reason: Change-Id I670345494abbad80dacab54471e635abfae3b3b3 with SHA-1 bd67bf8690 is in history

Change-Id: I1be70f8919c1c057f91ec8146745a5bcba1a72e9
2019-12-20 00:06:13 +00:00
Ulyana Trafimovich
3b56e37f19 Merge "Rollback to the legacy way of computing boot image locations." 2019-12-20 00:06:13 +00:00
Automerger Merge Worker
fcce7ed08f [automerger skipped] DO NOT MERGE: Add tradefed_java_library_host am: 853f5c9edd am: f8e1fca17b -s ours
am skip reason: Change-Id I670345494abbad80dacab54471e635abfae3b3b3 with SHA-1 bd67bf8690 is in history

Change-Id: I31b8631bc160a6397579c6734445b42c738188f6
2019-12-20 00:05:36 +00:00
Kimberly Kreider
67e2fce593 Revert submission 9919844-manual r1 merge
Reason for revert: broke tests b/146476630
Bug: 146476630
Reverted Changes:

Change-Id: I66b0f86dfc6336fa0dd88e6e4c340744a4791efd
2019-12-19 23:57:58 +00:00
Automerger Merge Worker
409c8fb2b4 Merge "Remove unused testWritablePath and associated methods" am: 6b295312f6 am: 5a79e0befe am: 89d5d90ccd
Change-Id: I8bdce63d6743b67568eb92767e4ec4c06ba8c112
2019-12-19 23:53:33 +00:00
Automerger Merge Worker
3deb5aecc8 Merge "Extend RegistrationContext to support pre/post deps mutators" am: f5f1ecb746 am: 4d6b0afa0d am: 18a61cfd46
Change-Id: I29feb7d111873c80a72d891f3f4b9b07e69b4019
2019-12-19 23:53:18 +00:00
Jooyung Han
58f26aba4e Support java_sdk_library as java_libs of apex
When a java_sdk_library module is added, both impl jar and permission
xml files are packaged together.

For example, when a java_sdk_library "foo" is listed, following two
entries will be in an APEX package.

/javalibs/foo.jar
/etc/permissions/foo.xml

Bug: 145474221
Test: m com.android.cronet
      deapexer list com.android.cronet.apex

Change-Id: If5883c02255e9309f20810b1532d3fbe73bf4e95
2019-12-20 08:50:34 +09:00
Automerger Merge Worker
5df94fa457 DO NOT MERGE: Add tradefed_java_library_host am: cba45b2892 am: 4f2eeaba4e
Change-Id: I6ad1c987e630d4a5d273055f67bd89d0da54a0bb
2019-12-19 23:47:59 +00:00
Automerger Merge Worker
f8e1fca17b DO NOT MERGE: Add tradefed_java_library_host am: 853f5c9edd
Change-Id: I43e5f13223e99e6edf4e04386a45e31fa1cb4312
2019-12-19 23:47:09 +00:00
Automerger Merge Worker
89d5d90ccd Merge "Remove unused testWritablePath and associated methods" am: 6b295312f6 am: 5a79e0befe
Change-Id: I1cfeb7e936bbdb06e26b1824a03de0947d8390bb
2019-12-19 23:41:03 +00:00
Automerger Merge Worker
18a61cfd46 Merge "Extend RegistrationContext to support pre/post deps mutators" am: f5f1ecb746 am: 4d6b0afa0d
Change-Id: I40acfc0b504c92c00c1f1d261e5e8d398c67267b
2019-12-19 23:40:47 +00:00
Automerger Merge Worker
0662e65654 Merge changes I7e9440a0,I7f1a4b64,If5d6fdac am: b237de1914 am: ab879385eb am: 396fd80826
Change-Id: I96741af41ba539d783787abc0b79f82caef2e5d4
2019-12-19 23:37:41 +00:00
Automerger Merge Worker
eabea666a6 Merge "Add helper functions for getting output files from modules" am: f6b213f050 am: e38bc3ab54 am: b5b5280325
Change-Id: I37b0bb6dc63f6475ffddc01ef471c4946951f34a
2019-12-19 23:37:23 +00:00
Automerger Merge Worker
eee2583d46 Merge "Make sh_binary a HostToolProvider" am: 35a261de1f am: 00b8468d9c am: 525f567d72
Change-Id: I8394595c5ad5971864b7f60c13aa4983c89fd075
2019-12-19 23:37:06 +00:00
Automerger Merge Worker
d3bc7e35ab Merge changes I982fcb8d,I17f24fe1,If5740476 am: 4326e7375c am: 22cf68dcd1 am: d8b3bb0425
Change-Id: Iae44eab1a6a654117f221b04dce62d9edd5659dd
2019-12-19 23:34:51 +00:00
Paul Duffin
5a79e0befe Merge "Remove unused testWritablePath and associated methods"
am: 6b295312f6

Change-Id: I1b1ed58e516669a7dcc6d86de101bf9d4d183e4b
2019-12-19 15:17:36 -08:00
Treehugger Robot
6b295312f6 Merge "Remove unused testWritablePath and associated methods" 2019-12-19 23:14:55 +00:00
Paul Duffin
4d6b0afa0d Merge "Extend RegistrationContext to support pre/post deps mutators"
am: f5f1ecb746

Change-Id: I5a5e250417fc5d5110df40f9be78cb9cd8836123
2019-12-19 15:08:51 -08:00