Dan Albert
68e9a68014
Merge "Link libc++demangle with libc++ for the device."
...
am: 400c218219
Change-Id: I3f736121bf894a57a6d066672fb8a61d08adbce5
2019-08-21 17:25:35 -07:00
Peter Collingbourne
074651ba13
Merge "Only include the "tools" and "testcases" subdirectories in android-cts.zip."
...
am: 0f9ac40dd6
Change-Id: Iccd2f3cbcad562a0fa7a089cb48f10db1ace7177
2019-08-21 17:24:25 -07:00
Jeff Sharkey
fc587b926d
Merge "Add "owngrep" shell utility."
2019-08-22 00:02:02 +00:00
Treehugger Robot
400c218219
Merge "Link libc++demangle with libc++ for the device."
2019-08-21 23:54:48 +00:00
Treehugger Robot
0f9ac40dd6
Merge "Only include the "tools" and "testcases" subdirectories in android-cts.zip."
2019-08-21 23:45:47 +00:00
Roland Levillain
0a416ce07e
Merge "Rename Soong variable FlattenApex
as Flatten_apex
."
...
am: 57b8a7cf66
Change-Id: I0ace2508ef1e9676073b808e10310a0d45694d4c
2019-08-21 13:13:46 -07:00
Tom Cherry
e3fa048c10
Merge "Add group_system_ext and passwd_system_ext"
...
am: e6012c8826
Change-Id: Ib8d0e502fba999796cd24fbc6e065fea328547a2
2019-08-21 13:12:40 -07:00
Jeff Sharkey
f17cddfa5b
Add "owngrep" shell utility.
...
Bug: 132612223
Test: manual
Change-Id: Ibe27e419caaf4ebcbb5d48ab50cc71730c320e1c
2019-08-21 13:55:52 -06:00
Roland Levillain
57b8a7cf66
Merge "Rename Soong variable FlattenApex
as Flatten_apex
."
2019-08-21 19:55:47 +00:00
Dan Willemsen
d7994816c1
Remove package-stats.txt
...
I can't find any remaining users of this functionality.
Test: codesearch; treehugger
Change-Id: I63b079b381211b743baa293267c992d9b2eadcf9
2019-08-21 12:36:14 -07:00
Peter Collingbourne
bbddfcf7ba
Only include the "tools" and "testcases" subdirectories in android-cts.zip.
...
Without this, we can end up packaging log files from previous CTS runs in
the zip file. If the names of those log files contain whitespace characters,
it can result in a build failure.
Change-Id: Id96d1915a03b6a715acfdc212c9b2d6f28045baa
2019-08-21 12:31:41 -07:00
Tom Cherry
e6012c8826
Merge "Add group_system_ext and passwd_system_ext"
2019-08-21 19:19:23 +00:00
Tom Cherry
9f8d4eba01
Add group_system_ext and passwd_system_ext
...
Add the remaining group and passwd files for partitions that have
reserved AIDs.
Test: mainline checks pass
Change-Id: Iae62c9465e0144b77b1d804c17fe6e724a744da2
2019-08-21 08:16:16 -07:00
Tianjie Xu
d4400ca15f
Merge "Generate block based OTA for product partitions"
...
am: 2211352eed
Change-Id: Ib36f9dde2982d77fdd2a8a74d2e80d7a8b21326e
2019-08-20 13:39:52 -07:00
Tianjie Xu
2211352eed
Merge "Generate block based OTA for product partitions"
2019-08-20 20:01:33 +00:00
Jeongik Cha
9478f66632
Turn on BOARD_USES_METADATA_PARTITION in mainline
...
All the targets that inherit mainline seem to use metadata_partition,
So turn on BOARD_USES_METADATA_PARTITION
Bug: 137920314
Bug: 139731063
Test: m && check if there is /metadata
Change-Id: I17cfb5faf76a3c3d6ce1be594274ea58ebc1d1ae
2019-08-20 14:26:11 +00:00
Anton Hansson
5f7c08fbb3
Remove stale artifact whitelist entries
...
Test: lunch mainline_arm64; m nothing
Change-Id: Ia495ed7b883fd100fdb75206c13cedb6fa62b0b2
2019-08-20 12:17:06 +01:00
Jeongik Cha
6a5e9a21ef
SYSTEM_EXT supports executables
...
Because TARGET_OUT_SYSTEM_EXT_EXECUTABLES have been omitted, we cannot
install any executables in system_ext.
So fix it.
Test: set system_ext_specific true in some executable, and then check if
it is installed in /system_ext/bin
Bug: 139719550
Change-Id: I1bc7a2e6a7c25ec4b5b1ea6358ba8d3e1ae6331b
2019-08-20 19:24:43 +09:00
Tianjie Xu
f67dd8059d
Generate block based OTA for product partitions
...
Currently only the system and vendor partitions are updated in the
generic block based OTA generation script. Since the product partition
is quite large and consist most of APK files, it would be beneficial to
update it similar to system. Handle the odm and system_ext partitions in
the same way as well.
Bug: 132683080
Test: Run unit tests, generate full and incremental OTA with product partitions.
Change-Id: I13478cf9bd32137c6729b8c9cb102080147093f2
2019-08-20 00:18:00 -07:00
TreeHugger Robot
f65d253f07
Merge "Fix boot failure on Q devices with GSI on master" into stage-aosp-master
2019-08-20 01:19:32 +00:00
Paul Trautrim
bb78e6bfb8
Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation"
...
am: 23b46e54ac
Change-Id: Idc47cbfa3c54faa3656d2df156fef55ba5546ebd
2019-08-19 17:43:39 -07:00
Paul Trautrim
23b46e54ac
Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation"
2019-08-20 00:07:35 +00:00
Anton Hansson
7acb41d787
Remove stale artifact whitelist entries
...
Test: lunch mainline_arm64; m nothing
Change-Id: Ia495ed7b883fd100fdb75206c13cedb6fa62b0b2
Merged-In: Ia495ed7b883fd100fdb75206c13cedb6fa62b0b2
2019-08-19 16:42:48 +01:00
Paul Trautrim
6c3aa71d1b
Merge "Use --add_missing in merge_target_files.py"
...
am: cc875c1482
Change-Id: I0abe618a8e1900c57b67060361b46807531cddd7
2019-08-19 04:05:40 -07:00
Paul Trautrim
cc875c1482
Merge "Use --add_missing in merge_target_files.py"
2019-08-19 10:50:35 +00:00
Howard Chen
05f553aa5d
Fix boot failure on Q devices with GSI on master
...
The master GSI is required to support both P and Q.
Bug: 136695702
Test: Boot a Q device with GSI on master
Change-Id: Ic6da4c4a81d145414ba6cb1bde1ccf3b4a8150f1
2019-08-18 23:16:02 +00:00
nelsonli
7dc1cbe13c
Merge "VTS: Add vts-core to the dependency of tests"
...
am: 1413925ac4
Change-Id: I6a2dd9858e0a9c30d1d08b0815c5fbc54e568c5c
2019-08-15 18:48:35 -07:00
Treehugger Robot
1413925ac4
Merge "VTS: Add vts-core to the dependency of tests"
2019-08-16 01:21:02 +00:00
Tao Bao
22fa2f20ae
Merge "Stop packing system/update_engine/scripts."
...
am: d994b4c062
Change-Id: Iaa3633d3c087d3962d3408c4aefe33037f68f430
2019-08-15 16:44:43 -07:00
Tao Bao
d994b4c062
Merge "Stop packing system/update_engine/scripts."
2019-08-15 23:09:21 +00:00
Colin Cross
fb4c69eebc
Merge "Make javamicro a plugin"
...
am: c61d0f966b
Change-Id: Ie4a9eca7b0fc9043f777947cf2cf3898f37c7c24
2019-08-15 13:13:23 -07:00
Tao Bao
07997f1bb4
Stop packing system/update_engine/scripts.
...
We once attempted to use them (by importing from releasetools scripts)
to parse payload. Due to the dependency on google.protobuf, we have
switched to delta_generator instead (commit 750385e4
).
Bug: 65261072
Test: `m -j otatools-package`; and check the related scripts are not
included.
Change-Id: Iaa8bcb0e2792e48512e1b8db29869db875ba8dc9
2019-08-15 12:10:05 -07:00
Treehugger Robot
c61d0f966b
Merge "Make javamicro a plugin"
2019-08-15 18:18:38 +00:00
Anton Hansson
c2a5e48d82
Cleanup aosp_product whitelist
...
These files are build by mainline_system now.
Bug: 138280590
Test: lunch aosp_arm64; m nothing
Change-Id: Icff82e94c538d4e35ca5e73d04b6f02d6731df4c
2019-08-15 12:33:33 +01:00
Remi NGUYEN VAN
ff51a362fd
Merge "Add a product build var for mainline module certs"
...
am: a7832d5543
Change-Id: I00c77685a3b630049a2f578258d54cdc6e973e3a
2019-08-15 01:11:22 -07:00
Treehugger Robot
a7832d5543
Merge "Add a product build var for mainline module certs"
2019-08-15 07:43:46 +00:00
Xin Li
c801230025
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
...
am: c2852177bb
-s ours
am skip reason: subject contains skip directive
Change-Id: I31703244f0d5dec81d43625277ef1bce4d6ad570
2019-08-14 23:29:27 -07:00
Treehugger Robot
c2852177bb
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
2019-08-15 06:13:48 +00:00
Tao Bao
03e726ce10
[automerger skipped] Merge "Makefile uses add_img_to_target_files module."
...
am: 27480a0cf4
-s ours
am skip reason: change_id Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117 with SHA1 c1966a8bdd
is in history
Change-Id: Ia777279685dc98bb7490380db88a31f32dac5921
2019-08-14 21:53:30 -07:00
Tao Bao
27480a0cf4
Merge "Makefile uses add_img_to_target_files module."
2019-08-15 04:27:08 +00:00
Hsin-Yi Chen
a489b755a0
Merge "Add tags to lsdump_paths.txt"
...
am: 7205361315
Change-Id: I4874b39acd4727e6969c8ddb235c773c46ee8972
2019-08-14 19:44:40 -07:00
Hsin-Yi Chen
7205361315
Merge "Add tags to lsdump_paths.txt"
2019-08-15 02:20:30 +00:00
Bill Peckham
861ffd1588
Merge "Avoid adding VINTF manifest fragment more than once."
...
am: fd25038f8a
Change-Id: I44c12257269e039c78f20330fa5713775fec3b65
2019-08-14 16:04:02 -07:00
Bill Peckham
fd25038f8a
Merge "Avoid adding VINTF manifest fragment more than once."
2019-08-14 22:44:30 +00:00
Tao Bao
0a712a0834
Merge "Makefile uses add_img_to_target_files module." into stage-aosp-master
2019-08-14 21:46:17 +00:00
Xin Li
5e0e14531d
DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
Bug: 134405016
Change-Id: I77df4ab2e9f680668c903a55394743b313082620
2019-08-14 11:35:07 -07:00
Tao Bao
c1966a8bdd
Makefile uses add_img_to_target_files module.
...
Also pack additional tools into otatools.zip.
Bug: 63866463
Test: TreeHugger
Test: `m -j otatools-package`; Check the packed tools.
Change-Id: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
(cherry picked from commit 1cf8bf0c14
)
2019-08-14 10:44:53 -07:00
Tao Bao
1cf8bf0c14
Makefile uses add_img_to_target_files module.
...
Also pack additional tools into otatools.zip.
Bug: 63866463
Test: TreeHugger
Test: `m -j otatools-package`; Check the packed tools.
Change-Id: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
Merged-In: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
2019-08-14 10:34:59 -07:00
Tao Bao
f4157c5859
Merge "releasetools: Add more module building rules."
...
am: 39369d08fb
Change-Id: Ic422023eceae40922a6251f32982cc1141f86aac
2019-08-14 09:08:50 -07:00
Tao Bao
39369d08fb
Merge "releasetools: Add more module building rules."
2019-08-14 15:33:33 +00:00