Nicolas Geoffray
7769c3459a
Merge "Remove conscrypt from boot image."
2019-01-14 08:31:05 +00:00
Tao Bao
93e7ebe779
releasetools: OutputFile stages files under input dir.
...
We used to create the intermediate output file as a tempfile, when
adding images to a given zip file. This CL changes OutputFile to write
intermediate files under the given input dir (i.e. OPTIONS.input_tmp
that holds the unzipped files), if the final destination is a zip
archive. This allows image building codes finding the generated images
at consistent locations. The intermediate files will be cleaned up as
part of OPTIONS.input_tmp.
Bug: 122608028
Test: `m dist`
Test: Delete OTA/super*.img from a target_files.zip. Run
`add_img_to_target_files.py -a` that re-generates split super
images.
Change-Id: I97903a59fcc0ca5e43bb9b07c3a0b25e9baa92f9
2019-01-13 23:49:25 -08:00
Cheney Ni
96f1afda79
Add IBluetoothAudio HAL 2.0 to VNDK
...
Bug: 111519504
Test: build & boot
Change-Id: I4247b67709a68f26c670371e6a3407171988dcf4
Merged-In: I4247b67709a68f26c670371e6a3407171988dcf4
(cherry picked from commit b7e100c6be
)
2019-01-14 01:06:40 +00:00
Luca Stefani
9f9422819a
Merge "Make get-file-size compatible with toybox stat" am: 04d3c4f655
am: 796e2ed840
...
am: 2e1d45199e
Change-Id: Ifffd2b922ee78032c04abd75f7a5c12788534551
2019-01-12 14:59:38 -08:00
Luca Stefani
2e1d45199e
Merge "Make get-file-size compatible with toybox stat" am: 04d3c4f655
...
am: 796e2ed840
Change-Id: I474dbff839251abd24c186bb84e82112686aa777
2019-01-12 14:51:27 -08:00
Luca Stefani
796e2ed840
Merge "Make get-file-size compatible with toybox stat"
...
am: 04d3c4f655
Change-Id: I528266c18e5c6ee81bf54c853cd829e7c0df7535
2019-01-12 14:42:20 -08:00
Treehugger Robot
04d3c4f655
Merge "Make get-file-size compatible with toybox stat"
2019-01-12 22:28:18 +00:00
Sooraj Sasindran
29b4a933d3
[automerger skipped] Merge "Rename ANS to ONS" am: 4b2e0b22fb
am: 6fc5fb5fdb
...
am: 79226ccd0e
-s ours
am skip reason: change_id Id01f0fc595e736f081d97309f62426cc54ac9e94 with SHA1 181bc817f5
is in history
Change-Id: I0cc922acdce77334b2a8929820c322c19b8de1fb
2019-01-12 11:49:22 -08:00
Sooraj Sasindran
79226ccd0e
Merge "Rename ANS to ONS" am: 4b2e0b22fb
...
am: 6fc5fb5fdb
Change-Id: I42501bc5e190f9dd295a7bae9e3bcc9f6fd4eed8
2019-01-12 11:32:01 -08:00
Sooraj Sasindran
6fc5fb5fdb
Merge "Rename ANS to ONS"
...
am: 4b2e0b22fb
Change-Id: Ie613d87aee6484551e60924e57479b63ea1b32ef
2019-01-12 11:22:56 -08:00
Sooraj Sasindran
4b2e0b22fb
Merge "Rename ANS to ONS"
2019-01-12 19:11:53 +00:00
Luca Stefani
5f1faeb9c2
Make get-file-size compatible with toybox stat
...
* Use the same format as mk_qemu_image.sh
Change-Id: I5df23f488006440075a00798a171f7a8856e097a
2019-01-12 19:13:06 +01:00
Dan Willemsen
c3a7e536e1
Merge "Fix possible incremental build issue" am: c041a1bb47
am: a2d9fd221f
...
am: 9f5ae26142
Change-Id: Iaef551faae927f138ede50cdc824f6b1991b7615
2019-01-11 22:48:34 -08:00
Dan Willemsen
9f5ae26142
Merge "Fix possible incremental build issue" am: c041a1bb47
...
am: a2d9fd221f
Change-Id: Ib6dcb2541ec8b3cfbeb12c47db392568a152e860
2019-01-11 22:40:23 -08:00
Dan Willemsen
a2d9fd221f
Merge "Fix possible incremental build issue"
...
am: c041a1bb47
Change-Id: I3bc14a0641c7bae9bebee558b1a67b655495260f
2019-01-11 22:34:07 -08:00
Treehugger Robot
c041a1bb47
Merge "Fix possible incremental build issue"
2019-01-12 06:23:31 +00:00
Yifan Hong
5382ab0956
Merge "Fix size check for devices with multiple groups" am: b26319ca38
am: f7696a6544
...
am: 2310b04339
Change-Id: I4bc3a08090b1ebf0e5ff6962dad9b4d0f5105de9
2019-01-11 22:18:17 -08:00
Yifan Hong
2310b04339
Merge "Fix size check for devices with multiple groups" am: b26319ca38
...
am: f7696a6544
Change-Id: I73fa5f2a7416a9c6929c8a215bdda24e54d02715
2019-01-11 22:10:06 -08:00
Yifan Hong
f7696a6544
Merge "Fix size check for devices with multiple groups"
...
am: b26319ca38
Change-Id: I84f23b46bfbfd2af8aef7339e5efc177d492ecf8
2019-01-11 22:04:54 -08:00
Treehugger Robot
b26319ca38
Merge "Fix size check for devices with multiple groups"
2019-01-12 05:59:30 +00:00
Kevin Cheng
1225a1e1f9
Merge "Update acloud alias to support mac via workaround in go/acloud-mac." am: fa77f1be7a
am: 82f73db968
...
am: 252f982120
Change-Id: I4a11e29bd0171d3329ae06357cdcbdc4499f1f03
2019-01-11 21:40:07 -08:00
Kevin Cheng
252f982120
Merge "Update acloud alias to support mac via workaround in go/acloud-mac." am: fa77f1be7a
...
am: 82f73db968
Change-Id: I09eb26e7ce7e75de6f05495b098dc285a1691f7e
2019-01-11 21:34:57 -08:00
Kevin Cheng
82f73db968
Merge "Update acloud alias to support mac via workaround in go/acloud-mac."
...
am: fa77f1be7a
Change-Id: I599321589869a4e2a0250b8d8e381b4ab3de5fcd
2019-01-11 21:27:48 -08:00
Treehugger Robot
fa77f1be7a
Merge "Update acloud alias to support mac via workaround in go/acloud-mac."
2019-01-12 05:16:35 +00:00
Dan Willemsen
45539e3941
Fix possible incremental build issue
...
We tried to start using toybox's sed, but it produced invalid results
with one of init's genrules. Clear out that generated code to fix future
incremental builds, since we don't rebuild everything on a $PATH change.
Bug: 122744241
Test: generate bad file, remove toybox sed, apply this change
Change-Id: I197aa4b68b2fe309b3033e8736e1d80c8ded80ad
2019-01-11 19:51:06 -08:00
Sooraj Sasindran
5f0b754c6e
Merge "Rename ANS to ONS"
2019-01-12 02:32:32 +00:00
Tao Bao
3de7a10e2f
Merge "releasetools: Skip copying split super images while signing." am: 774c0f92bf
am: 2db2039202
...
am: f2cc65ba23
Change-Id: Ide56072bf73d8ada477aa5c03d30bf4a6d915e57
2019-01-11 16:25:18 -08:00
Tao Bao
ee3d514cf0
Merge "releasetools: Update OWNERS." am: dd95cf51fa
am: f37455e064
...
am: 7e0da84aa7
Change-Id: Ib5256c1274255cf1545d13994a3e1795e1d8428c
2019-01-11 16:15:49 -08:00
Tao Bao
f2cc65ba23
Merge "releasetools: Skip copying split super images while signing." am: 774c0f92bf
...
am: 2db2039202
Change-Id: Ie73f72e7c7eb460156a160361c385aa6c881658e
2019-01-11 15:51:22 -08:00
Tao Bao
7e0da84aa7
Merge "releasetools: Update OWNERS." am: dd95cf51fa
...
am: f37455e064
Change-Id: Iaed31f353af02242c94ddc98a0d34deb963bb795
2019-01-11 15:48:47 -08:00
Adam Seaton
2f19e51ae4
Merge platform/build into pi-platform-dev for January builds
2019-01-11 15:38:12 -08:00
Tao Bao
2db2039202
Merge "releasetools: Skip copying split super images while signing."
...
am: 774c0f92bf
Change-Id: I6c88a82476f9b3d4febb71f98e4c9a118a3d67d3
2019-01-11 15:33:40 -08:00
Tao Bao
f37455e064
Merge "releasetools: Update OWNERS."
...
am: dd95cf51fa
Change-Id: I7d52627267ce0f20a3151e8b25efaf3ed3c10f08
2019-01-11 15:32:28 -08:00
Tao Bao
774c0f92bf
Merge "releasetools: Skip copying split super images while signing."
2019-01-11 23:18:49 +00:00
Tao Bao
dd95cf51fa
Merge "releasetools: Update OWNERS."
2019-01-11 23:09:28 +00:00
Dan Willemsen
63324cdc23
Merge "Deprecate USER in favor of BUILD_USERNAME" am: d148d61ccf
am: d44ea2ae7c
...
am: 679c6e5339
Change-Id: I41168b15ef535abef3baa544177150cc20316a26
2019-01-11 14:54:18 -08:00
Dan Willemsen
679c6e5339
Merge "Deprecate USER in favor of BUILD_USERNAME" am: d148d61ccf
...
am: d44ea2ae7c
Change-Id: Iff595f60669738c1a93220d14eb1033da6e11c5e
2019-01-11 14:49:04 -08:00
TreeHugger Robot
a61bddc77b
Merge "Add IBluetoothAudio HAL 2.0 to VNDK"
2019-01-11 22:43:22 +00:00
Dan Willemsen
d44ea2ae7c
Merge "Deprecate USER in favor of BUILD_USERNAME"
...
am: d148d61ccf
Change-Id: Id73f0971f51029d21d66d5b45d1971b63d0116dd
2019-01-11 14:40:58 -08:00
Treehugger Robot
d148d61ccf
Merge "Deprecate USER in favor of BUILD_USERNAME"
2019-01-11 22:32:57 +00:00
Michael Butler
1ccc88056b
Merge "Revert "Add $(PRODUCT_OUT)/apex to the artifact path whitelist"" am: d15c8c1da4
am: 7babbf0bf8
...
am: 80f1ba1a20
Change-Id: Ic062e25a3d0472da427d18cc6385d6708db2f239
2019-01-11 13:29:06 -08:00
Yifan Hong
d58e70bf21
Fix size check for devices with multiple groups
...
The old code calls check-sum-of-partition-sizes within a foreach
loop, causing syntax error:
... fi partition_size_list=...
Add a semicolon after fi to fix this.
Test: build with multiple groups, each group with a partition in it
Change-Id: Ic4387408f3efc1744871619c300546765c678a61
2019-01-11 13:21:11 -08:00
Michael Butler
80f1ba1a20
Merge "Revert "Add $(PRODUCT_OUT)/apex to the artifact path whitelist"" am: d15c8c1da4
...
am: 7babbf0bf8
Change-Id: I7055fcff0b8ecea330ad3767966e320fe0fd173c
2019-01-11 13:13:40 -08:00
Michael Butler
7babbf0bf8
Merge "Revert "Add $(PRODUCT_OUT)/apex to the artifact path whitelist""
...
am: d15c8c1da4
Change-Id: I1c856b01224dbda666234aab1ee887d1c6c67416
2019-01-11 13:02:27 -08:00
Tao Bao
33bf268e0b
releasetools: Skip copying split super images while signing.
...
Bug: 122608028
Test: Run sign_target_files_apks.py on a target-files zip that has split
super images (e.g. OTA/super_system.img).
Change-Id: Iaf7263790961a897ea3f339f5af6b18cf253b946
2019-01-11 12:39:31 -08:00
Michael Butler
d15c8c1da4
Merge "Revert "Add $(PRODUCT_OUT)/apex to the artifact path whitelist""
2019-01-11 20:37:55 +00:00
Tao Bao
4b2306b41c
releasetools: Update OWNERS.
...
Test: N/A
Change-Id: I0c6ac3cd04cc6034787d4b8b90fbd61349c54655
2019-01-11 12:28:09 -08:00
Michael Butler
4cf7cde9aa
Revert "Add $(PRODUCT_OUT)/apex to the artifact path whitelist"
...
This reverts commit 3387e65686
.
Reason for revert: Topic likely causing build failure on aosp_x86_64-eng in aosp_master:
"build/make/core/base_rules.mk:271: error: art/build/apex: MODULE.TARGET.SHARED_LIBRARIES.com.android.runtime.host.libart-compiler already defined by art/build/apex."
Change-Id: I2033828e7a13062b72d1d66a7f289cf5bb12b776
2019-01-11 20:24:25 +00:00
Roland Levillain
4c8618566a
Merge "Support kryo385 CPU." am: 2e77d4ee2c
am: cdee52b383
...
am: 11113a4e56
Change-Id: I1bae043f328680b4abb2412697331004207b6b4f
2019-01-11 11:42:18 -08:00
Roland Levillain
11113a4e56
Merge "Support kryo385 CPU." am: 2e77d4ee2c
...
am: cdee52b383
Change-Id: I995e98c1563fdfc01657c37bc400b05c84950252
2019-01-11 11:10:40 -08:00