Commit Graph

78760 Commits

Author SHA1 Message Date
Treehugger Robot
f410e60564 Merge "Remove sdkPreSingleton and overlaySingleton" into main am: a741e88489 am: 233ec66675 am: 1d8482839d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813819

Change-Id: I52783885f933e81176b0ff45338968e5af11f773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 05:20:31 +00:00
Treehugger Robot
1d8482839d Merge "Remove sdkPreSingleton and overlaySingleton" into main am: a741e88489 am: 233ec66675
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813819

Change-Id: Ib5013d2c14f8c2c75dd38a06f1d65e3888bd9de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 04:39:46 +00:00
Treehugger Robot
233ec66675 Merge "Remove sdkPreSingleton and overlaySingleton" into main am: a741e88489
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813819

Change-Id: I4be5074e92607920fabfdda79b3d707f79e7aa25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 04:11:01 +00:00
Treehugger Robot
a741e88489 Merge "Remove sdkPreSingleton and overlaySingleton" into main 2023-11-02 03:43:15 +00:00
Treehugger Robot
3f7b04a8eb Merge changes I7bc4d8d4,I8158c0b9 into main am: 9ae2999dab am: b98b24b053 am: d7b754a37a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814560

Change-Id: I549c45147e7a7bf84549af89201b115fbd916ede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 00:51:26 +00:00
Treehugger Robot
5253a603a1 Merge "Add mount_point property to android_filesystem" into main am: b92dac45d0 am: f12356ae14 am: f469e1c9b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813975

Change-Id: Ice15f32479be08f46ac510869bda7965b56474bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 00:51:16 +00:00
Treehugger Robot
f7b061345c Merge changes I7bc4d8d4,I8158c0b9 into main am: 9ae2999dab am: 54c1f3a86b am: f1a233ec58
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814560

Change-Id: Ib64ec84864d53de9d6bf18d28de398f5cd79d95b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 00:50:42 +00:00
Treehugger Robot
890eeced92 Merge "Add mount_point property to android_filesystem" into main am: b92dac45d0 am: 23cfb18a6b am: 5839656acf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813975

Change-Id: Ie4f0fc441ce5cf304a152f7727ee54a36d477754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 00:50:08 +00:00
Treehugger Robot
d7b754a37a Merge changes I7bc4d8d4,I8158c0b9 into main am: 9ae2999dab am: b98b24b053
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814560

Change-Id: I68676ace44903a0eab5394831f1efa5bc8db40eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 00:44:26 +00:00
Treehugger Robot
f469e1c9b0 Merge "Add mount_point property to android_filesystem" into main am: b92dac45d0 am: f12356ae14
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813975

Change-Id: If33d0e1130c7e0a60d9873bc0d3372caa2eb2a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 00:44:13 +00:00
Treehugger Robot
b98b24b053 Merge changes I7bc4d8d4,I8158c0b9 into main am: 9ae2999dab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814560

Change-Id: Ia9de5ae8687d436b60a79c50b999fb753d90c9db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 00:16:22 +00:00
Treehugger Robot
f12356ae14 Merge "Add mount_point property to android_filesystem" into main am: b92dac45d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813975

Change-Id: I20fcf5b24188ef54059540b33fe86d0b9acbda2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 00:16:00 +00:00
Treehugger Robot
f1a233ec58 Merge changes I7bc4d8d4,I8158c0b9 into main am: 9ae2999dab am: 54c1f3a86b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814560

Change-Id: I09c2201d34f83e03d7e2d03fc1d82315e325200c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 00:12:55 +00:00
Treehugger Robot
5839656acf Merge "Add mount_point property to android_filesystem" into main am: b92dac45d0 am: 23cfb18a6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813975

Change-Id: I5c0331eeee8526522b1f5b6ee6fb2bcebe2f36f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 00:12:25 +00:00
Treehugger Robot
54c1f3a86b Merge changes I7bc4d8d4,I8158c0b9 into main am: 9ae2999dab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814560

Change-Id: I1f0d5a8b85485f51a2463894194c1cf7ce4d096f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 23:44:13 +00:00
Treehugger Robot
23cfb18a6b Merge "Add mount_point property to android_filesystem" into main am: b92dac45d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813975

Change-Id: I516c1fb4b869e3e6d776315409121de99c966f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 23:43:40 +00:00
Treehugger Robot
9ae2999dab Merge changes I7bc4d8d4,I8158c0b9 into main
* changes:
  Use merge_zips instead of ziptime for resetting timestamps in jacoco outputs
  Always reset timestamps in merge_zips
2023-11-01 23:38:29 +00:00
Treehugger Robot
b92dac45d0 Merge "Add mount_point property to android_filesystem" into main 2023-11-01 23:32:27 +00:00
Cole Faust
9bef67488d Remove sdkPreSingleton and overlaySingleton
These were the only 2 pre-singletons in soong. sdkPreSingleton is
totally unused. overlaySingleton can be done during
GenerateAndroidBuildActions instead.

Test: m nothing --no-skip-soong-tests
Change-Id: Ieb5ab92f18cb56be4049c0842f61df8aa02dc52c
2023-11-01 15:29:09 -07:00
Colin Cross
c8c2cee06a Use merge_zips instead of ziptime for resetting timestamps in jacoco outputs
ziptime doesn't support ZIP64 so it is limited to 65535 entries in
a zip file.  Use the newly added support in merge_zips to reset the
timestamp instead.

Bug: 308765940
Test: builds
Change-Id: I7bc4d8d4943e7417af1783a63ac5b5904d2aa751
2023-11-01 14:41:48 -07:00
Colin Cross
fa24df6b23 Always reset timestamps in merge_zips
Jacoco uses ziptime and then merge_zips.  merge_zips is already rewriting
all the zip headers so its trivial to move the ziptime functionality
into merge_zips.

Bug: 308765940
Test: TestMergeZips
Change-Id: I8158c0b99878492233ac01fde3820e1951c9088e
2023-11-01 14:41:40 -07:00
Spandan Das
81331ae2a7 Merge "Add the name of the sdk library to dynamically generated java modules" into main am: eb852927d4 am: a86290f27e am: 48a2ae5b0f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808372

Change-Id: I72ee4f837a668a944da16c6f746b25a9f153b8ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 18:32:33 +00:00
Spandan Das
b9585e851b Merge "Add the name of the sdk library to dynamically generated java modules" into main am: eb852927d4 am: bfdc9a89e0 am: f72007139d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808372

Change-Id: If94853a204f6c565b94a71f636c08f1f717fc746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 18:32:05 +00:00
Colin Cross
52b36567f2 Merge "Support prebuilt_renderscript_bitcode modules" into main am: 3996ffbc13 am: 7ab0d6356a am: bc2a4ba645
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2810857

Change-Id: I86f05eb3756a1daa9fb2be6b0295d8770d717b28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 18:31:37 +00:00
Colin Cross
4e803eec7a Merge "Support prebuilt_renderscript_bitcode modules" into main am: 3996ffbc13 am: d4aefabb11 am: 024a1a9cee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2810857

Change-Id: Ic1e63c1c50013c9e7d74ce6d849672d9821f596f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 18:30:46 +00:00
Colin Cross
ab7077eca7 Merge "Use correct path for soong_build_metrics.pb when dist is enabled" into main am: 2650f35faa am: 5ed2c54040 am: c106ef3b52
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812554

Change-Id: I758723309257f3540e1f0cd51d5c346247c387c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 18:27:38 +00:00
Colin Cross
22db1d3a9f Merge "Use correct path for soong_build_metrics.pb when dist is enabled" into main am: 2650f35faa am: dcaeff507a am: 38a5e8285a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812554

Change-Id: I456b979bf2aca28b1f040e1dbceb5449df059501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 18:26:10 +00:00
Spandan Das
48a2ae5b0f Merge "Add the name of the sdk library to dynamically generated java modules" into main am: eb852927d4 am: a86290f27e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808372

Change-Id: I1cbabda383bacb683f1996d3ca2576ec7eb5a4a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 18:17:54 +00:00
Spandan Das
a86290f27e Merge "Add the name of the sdk library to dynamically generated java modules" into main am: eb852927d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808372

Change-Id: I10282df38584510bd384c3750caad245b4ef9330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:50:52 +00:00
Spandan Das
f72007139d Merge "Add the name of the sdk library to dynamically generated java modules" into main am: eb852927d4 am: bfdc9a89e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808372

Change-Id: I803fda5f7a63d1e5d7f35dc9d649b848832d6368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:49:34 +00:00
Colin Cross
bc2a4ba645 Merge "Support prebuilt_renderscript_bitcode modules" into main am: 3996ffbc13 am: 7ab0d6356a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2810857

Change-Id: Ia3b61a87ebfabdef6bb12d09a676c42e9447b67c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:49:12 +00:00
Spandan Das
bfdc9a89e0 Merge "Add the name of the sdk library to dynamically generated java modules" into main am: eb852927d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808372

Change-Id: I7464d1574398c891b4bca139a4c6a8c8399c9491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:48:35 +00:00
Colin Cross
024a1a9cee Merge "Support prebuilt_renderscript_bitcode modules" into main am: 3996ffbc13 am: d4aefabb11
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2810857

Change-Id: I39b23e47ced63d19068dc6936898bf3bdc670287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:47:32 +00:00
Colin Cross
c106ef3b52 Merge "Use correct path for soong_build_metrics.pb when dist is enabled" into main am: 2650f35faa am: 5ed2c54040
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812554

Change-Id: I16bc55d323baca634012c528a3b37df590b380fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:47:09 +00:00
Colin Cross
38a5e8285a Merge "Use correct path for soong_build_metrics.pb when dist is enabled" into main am: 2650f35faa am: dcaeff507a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812554

Change-Id: Ib3ed1f73ac4a068979e15b8072cb1cb8ecfd097b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:42:22 +00:00
Spandan Das
eb852927d4 Merge "Add the name of the sdk library to dynamically generated java modules" into main 2023-11-01 17:31:58 +00:00
Colin Cross
d4aefabb11 Merge "Support prebuilt_renderscript_bitcode modules" into main am: 3996ffbc13
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2810857

Change-Id: Ie32b03d9031cefce41f4ce1f1ce6ecdbe80bb38d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:15:04 +00:00
Colin Cross
7ab0d6356a Merge "Support prebuilt_renderscript_bitcode modules" into main am: 3996ffbc13
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2810857

Change-Id: I7a762c90c9c5216a5498821821abde6956bb3c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:15:04 +00:00
Colin Cross
5ed2c54040 Merge "Use correct path for soong_build_metrics.pb when dist is enabled" into main am: 2650f35faa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812554

Change-Id: I2ece35178fa0812f15116da88924b3676f59aee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:14:52 +00:00
LaMont Jones
6eee61b191 Merge "Add support for PRODUCT_RELEASE_CONFIG_MAPS" into main am: c416ddd1cc am: a159227c5e am: cdef52cdbf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786983

Change-Id: Ic53a984ed621c653a725beffd508a2d918ab4345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:14:21 +00:00
Sam Delmerico
c33ad47b2f Merge "transitive r8 flags for installable {android,java}_libraries" into main am: d9569528bd am: 92bacc72a1 am: bbd06a3c04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812555

Change-Id: Icadfdf58bd7a8f2cef51c9fb9fca970eae431baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:13:13 +00:00
LaMont Jones
a1de1b87b6 Merge "Add support for PRODUCT_RELEASE_CONFIG_MAPS" into main am: c416ddd1cc am: 1b6f1d27a0 am: fe850386f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786983

Change-Id: I9df8ff55cbe9d648416ee087eb5d1906bf6fb02d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:12:10 +00:00
Sam Delmerico
1f2d568105 Merge "transitive r8 flags for installable {android,java}_libraries" into main am: d9569528bd am: 0b74fbb608 am: 727dc7ce68
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812555

Change-Id: I3a029e51decdbcc76959cc056c5c2c69cbfe77d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:11:59 +00:00
Colin Cross
dcaeff507a Merge "Use correct path for soong_build_metrics.pb when dist is enabled" into main am: 2650f35faa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812554

Change-Id: Ic41467c4efcfe663b20670c01aa15916a57ff864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:11:32 +00:00
Colin Cross
3996ffbc13 Merge "Support prebuilt_renderscript_bitcode modules" into main 2023-11-01 17:07:54 +00:00
Colin Cross
2650f35faa Merge "Use correct path for soong_build_metrics.pb when dist is enabled" into main 2023-11-01 16:54:14 +00:00
LaMont Jones
cdef52cdbf Merge "Add support for PRODUCT_RELEASE_CONFIG_MAPS" into main am: c416ddd1cc am: a159227c5e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786983

Change-Id: I8adf6e93c544e1dd0fa1775e57e8e6b155d7c5c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 16:34:58 +00:00
Sam Delmerico
bbd06a3c04 Merge "transitive r8 flags for installable {android,java}_libraries" into main am: d9569528bd am: 92bacc72a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812555

Change-Id: Ibdf416956ac50fbee6a817010600e7e37cb3b144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 16:34:34 +00:00
LaMont Jones
fe850386f7 Merge "Add support for PRODUCT_RELEASE_CONFIG_MAPS" into main am: c416ddd1cc am: 1b6f1d27a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786983

Change-Id: I56bf1b239e1cb77550b95b579053cc6b04668f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 16:32:51 +00:00
Sam Delmerico
727dc7ce68 Merge "transitive r8 flags for installable {android,java}_libraries" into main am: d9569528bd am: 0b74fbb608
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812555

Change-Id: I1456be6b3d86fa9e55787112c5fa239a21b025cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 16:32:34 +00:00