Hyundo Moon
5c8da738e2
Merge "Allow service-media-s in apex" am: 2b7d4e1ba4
am: 0f4f57c874
am: b1df1811a5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1552047
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f0ef4e0a298d1abe9293a675fdaf8e3bd0d6c98
2021-01-21 16:36:13 +00:00
Treehugger Robot
0d8aa8738d
Merge "LOCAL_REQUIRED_MODULES from apex has ":32" or ":64" suffix" am: d684e04247
am: 8cad077197
am: 67c3e24f07
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554988
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4141d6a90656048ee7230d3fd2078c5a4f9d5c18
2021-01-21 16:36:03 +00:00
Hyundo Moon
b1df1811a5
Merge "Allow service-media-s in apex" am: 2b7d4e1ba4
am: 0f4f57c874
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1552047
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7401a60614c1c9fdd20158ee52f7e83a7fbe1c73
2021-01-21 16:00:31 +00:00
Treehugger Robot
67c3e24f07
Merge "LOCAL_REQUIRED_MODULES from apex has ":32" or ":64" suffix" am: d684e04247
am: 8cad077197
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554988
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0ae1fe2d82965048cd1540770220630debcee87d
2021-01-21 16:00:11 +00:00
Hyundo Moon
0f4f57c874
Merge "Allow service-media-s in apex" am: 2b7d4e1ba4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1552047
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib486e889121be220005edca233c5377dc2c1acac
2021-01-21 15:35:44 +00:00
Treehugger Robot
8cad077197
Merge "LOCAL_REQUIRED_MODULES from apex has ":32" or ":64" suffix" am: d684e04247
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554988
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b48d2e124f936c85339426d93e474be67c59856
2021-01-21 15:34:46 +00:00
Hyundo Moon
2b7d4e1ba4
Merge "Allow service-media-s in apex"
2021-01-21 15:00:13 +00:00
Treehugger Robot
d684e04247
Merge "LOCAL_REQUIRED_MODULES from apex has ":32" or ":64" suffix"
2021-01-21 14:34:37 +00:00
Inseob Kim
0c9e1d388d
Merge "Truncate vendor snapshot header glob list after filtering it" am: ec7cab81f9
am: 249609366d
am: cb6d9b1d29
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555161
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie569526241f5e1b59caa3505422f34e45bfeb0b0
2021-01-21 07:56:04 +00:00
Inseob Kim
cb6d9b1d29
Merge "Truncate vendor snapshot header glob list after filtering it" am: ec7cab81f9
am: 249609366d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555161
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2629c37ffd381af9a3476c4afe73d901e22b3efd
2021-01-21 07:37:16 +00:00
Inseob Kim
249609366d
Merge "Truncate vendor snapshot header glob list after filtering it" am: ec7cab81f9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555161
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc5af4094ee54f24c91ca87c138afa029d4829cf
2021-01-21 07:05:06 +00:00
Inseob Kim
ec7cab81f9
Merge "Truncate vendor snapshot header glob list after filtering it"
2021-01-21 06:32:49 +00:00
Hyundo Moon
8bee1b00ea
Allow service-media-s in apex
...
Bug: 175511943
Test: Builds successfully
Change-Id: I5d76087d3c537205e8b8ca837c13ca1aeb641b4c
2021-01-21 02:21:23 +00:00
Inseob Kim
c98399e60f
Merge "Speed up vendor snapshot header globs" am: ab15f9644b
am: 9a7f405bc9
am: ee3791b9f4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554550
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I76b8036af1266c565e0ad79c59c6094dc9877f2a
2021-01-21 02:10:42 +00:00
Jiyong Park
280961131e
Merge changes Ifa1ed8de,I969bf4a2 am: 636b767835
am: 131cdd5c61
am: 23b4d9889b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553995
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I79ae56c6f0563c8ef393fc953f4a0f9818198427
2021-01-21 02:10:11 +00:00
Inseob Kim
ee3791b9f4
Merge "Speed up vendor snapshot header globs" am: ab15f9644b
am: 9a7f405bc9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554550
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7dd789bf526d2ffe9d1be43f01b6f59f501b0be4
2021-01-21 01:49:35 +00:00
Jiyong Park
23b4d9889b
Merge changes Ifa1ed8de,I969bf4a2 am: 636b767835
am: 131cdd5c61
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553995
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac2c34dd2b822f909c57f7ff8b80b7d1ce4e6ff5
2021-01-21 01:49:07 +00:00
Inseob Kim
9a7f405bc9
Merge "Speed up vendor snapshot header globs" am: ab15f9644b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554550
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I28e83f1869b7f3af37b15046bb783659ad5ec1d2
2021-01-21 01:21:29 +00:00
Colin Cross
dd519c3d31
Move reflect.ValueOf out of product variable loop am: 0cec312660
am: 5a9e13a2aa
am: 2a1c334cde
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib3634e91762b40d52637f939106e1dc35d425eec
2021-01-21 01:19:33 +00:00
Jiyong Park
131cdd5c61
Merge changes Ifa1ed8de,I969bf4a2 am: 636b767835
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553995
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9160184009067e43b8d9fca97e8e2d73d72df735
2021-01-21 01:10:08 +00:00
Colin Cross
2a1c334cde
Move reflect.ValueOf out of product variable loop am: 0cec312660
am: 5a9e13a2aa
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6fce317d50a3c03ca838a9f4d2d3d943d649c8c1
2021-01-21 00:58:34 +00:00
Colin Cross
3a62a9cc2b
Truncate vendor snapshot header glob list after filtering it
...
Test: m checkbuild
Change-Id: I4847bff5c03844194a9a80e8cb24a60694db6208
2021-01-21 00:46:46 +00:00
Inseob Kim
ab15f9644b
Merge "Speed up vendor snapshot header globs"
2021-01-21 00:37:19 +00:00
Jiyong Park
636b767835
Merge changes Ifa1ed8de,I969bf4a2
...
* changes:
Sign android_filesystem with avbtool
Refactor filesystem.go to make it easy to build prop file
2021-01-21 00:21:24 +00:00
Colin Cross
5a9e13a2aa
Move reflect.ValueOf out of product variable loop am: 0cec312660
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibc821ee6f7caa931e36d978d19302d6b86550c03
2021-01-21 00:02:59 +00:00
Nicolas Geoffray
981c30ca1e
Merge "dexpreopt: Use the dirty-image-objects path from frameworks/base." am: 324234bd00
am: d2aff3c2a1
am: e707c51e31
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555155
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ica0522d7c8cad6c00fe444178d11fa3a5e1833c7
2021-01-20 19:47:31 +00:00
Cindy Zhou
a426fafd20
[automerger skipped] Merge "Build against cfi supported coverage lib" am: 0ae13ec307
am: 1efd2a75bf
am: 735f882772
-s ours
...
am skip reason: Change-Id I8e0421cdf1c6e499292cfa3457cefd3c42f13155 with SHA-1 7e82baa8fe
is in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1546369
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If4ddb58c4e180146820726e411f5e4b727aabc3e
2021-01-20 19:47:20 +00:00
Colin Cross
217f7b33c4
Merge "Don't create SDK variants for native bridge modules" am: bdeafb93fd
am: f5cd3722cf
am: 5459575558
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553881
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iacbd8783289feed7aa810da0f0c7635067e73863
2021-01-20 19:46:58 +00:00
Ulyana Trafimovich
1a2949251b
Merge "Support building boot images with disabled dexpreopt." am: 0caabb6e27
am: 5602cf202b
am: fb9314da42
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555134
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5c35fc8382ab51307e4cb5e4a0b8b2d4c5553f8b
2021-01-20 19:46:47 +00:00
Bill Peckham
dccab29858
Merge changes from topic "prebuilt-hiddenapi" am: 1c8e5e817e
am: 24ac16d6e6
am: 96ddf7f0b3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1546365
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I626d7b1481b000c75a949522b91db36fc2fe213a
2021-01-20 19:46:31 +00:00
Christopher Parsons
9b95e029a0
Merge "avoid error if bazel intermediates dir already exists" am: 965561ce43
am: 661302cf96
am: 0db3c5556e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553880
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If5bfab20e643d9d6a87870ee2ed5f15bc059ec9f
2021-01-20 19:46:12 +00:00
Colin Cross
0cec312660
Move reflect.ValueOf out of product variable loop
...
Calling reflect.ValueOf for every variable for every module was
using ~3 seconds of CPU time on my AOSP builds.
Test: m checkbuild
Change-Id: Idf459ad8ddf5e07f6c0df0e58e2442aaa6ab3342
2021-01-20 19:32:42 +00:00
Nicolas Geoffray
e707c51e31
Merge "dexpreopt: Use the dirty-image-objects path from frameworks/base." am: 324234bd00
am: d2aff3c2a1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555155
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4e92e1ae8713f5451c9aa8aa097a576c3cd0f1a2
2021-01-20 19:02:51 +00:00
Cindy Zhou
735f882772
Merge "Build against cfi supported coverage lib" am: 0ae13ec307
am: 1efd2a75bf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1546369
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I62afe3c75690bbe2597bbffe623e5747f399c99a
2021-01-20 19:02:44 +00:00
Colin Cross
5459575558
Merge "Don't create SDK variants for native bridge modules" am: bdeafb93fd
am: f5cd3722cf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553881
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I88eb9f197903ea31e38a10634915a5cfd36ba8be
2021-01-20 19:02:24 +00:00
Ulyana Trafimovich
fb9314da42
Merge "Support building boot images with disabled dexpreopt." am: 0caabb6e27
am: 5602cf202b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555134
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I21223b7babf61153570127b16157217316dfe52c
2021-01-20 19:02:18 +00:00
Bill Peckham
96ddf7f0b3
Merge changes from topic "prebuilt-hiddenapi" am: 1c8e5e817e
am: 24ac16d6e6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1546365
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1e9ae289f82169794342723ba653a95a1f79241a
2021-01-20 19:02:05 +00:00
Christopher Parsons
0db3c5556e
Merge "avoid error if bazel intermediates dir already exists" am: 965561ce43
am: 661302cf96
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553880
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic4fb30274770651640202f469aa5db28206c8146
2021-01-20 19:01:54 +00:00
Colin Cross
0f93e5b9fb
Speed up vendor snapshot header globs
...
The vendor snapshot header globs were repeated 9 times, once for each
possible header suffix. Globbing is not a fast operation, so this
took 9.68s of CPU time in my AOSP builds. Replace it instead with a
single glob, followed by filtering down to the desired header
extensions.
Test: m checkbuild
Change-Id: I9c8f8cdad8cbffc0a42217659a48dd9d676e4e4c
2021-01-20 18:36:25 +00:00
Nicolas Geoffray
d2aff3c2a1
Merge "dexpreopt: Use the dirty-image-objects path from frameworks/base." am: 324234bd00
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555155
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I464d8e56844d77b2d04374950a99dcc4490b483c
2021-01-20 18:24:26 +00:00
Cindy Zhou
1efd2a75bf
Merge "Build against cfi supported coverage lib" am: 0ae13ec307
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1546369
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieaadc9008312045ac136ffe21d52b5ce24b3d201
2021-01-20 18:24:09 +00:00
Colin Cross
f5cd3722cf
Merge "Don't create SDK variants for native bridge modules" am: bdeafb93fd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553881
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac7ee26a007b3dea1ecbc300d0d5ebe971c7bf08
2021-01-20 18:23:46 +00:00
Ulyana Trafimovich
5602cf202b
Merge "Support building boot images with disabled dexpreopt." am: 0caabb6e27
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555134
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3af267485a201e15e1ab8abba5f6ed3ed707dc80
2021-01-20 18:22:57 +00:00
Bill Peckham
24ac16d6e6
Merge changes from topic "prebuilt-hiddenapi" am: 1c8e5e817e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1546365
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3062b116fda3d05730d510bafd4dd5183e444cc2
2021-01-20 18:22:17 +00:00
Christopher Parsons
661302cf96
Merge "avoid error if bazel intermediates dir already exists" am: 965561ce43
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1553880
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5e3e728fc79bdbe0bc5becf3328b6ff9499f70de
2021-01-20 18:21:27 +00:00
Nicolas Geoffray
324234bd00
Merge "dexpreopt: Use the dirty-image-objects path from frameworks/base."
2021-01-20 18:13:20 +00:00
Cindy Zhou
0ae13ec307
Merge "Build against cfi supported coverage lib"
2021-01-20 18:08:30 +00:00
Colin Cross
bdeafb93fd
Merge "Don't create SDK variants for native bridge modules"
2021-01-20 17:49:36 +00:00
Ulyana Trafimovich
0caabb6e27
Merge "Support building boot images with disabled dexpreopt."
2021-01-20 17:46:02 +00:00
Bill Peckham
1c8e5e817e
Merge changes from topic "prebuilt-hiddenapi"
...
* changes:
Supply LOCAL_SOONG_DEX_JAR for java_import with compile_dex.
Enable an apex to include a java_import.
Enable prebuilt hiddenapi CSV files.
2021-01-20 17:43:48 +00:00