Commit Graph

54076 Commits

Author SHA1 Message Date
Elliott Hughes
21e1dba28b Merge "macOS calls itself Darwin."
am: 33dfa52cdd

Change-Id: Ia00d0001106daaecf6b3a4b9b377c1663fd31bd9
2019-08-23 10:10:12 -07:00
Treehugger Robot
33dfa52cdd Merge "macOS calls itself Darwin." 2019-08-23 16:45:07 +00:00
Isaac Chen
5c40e0b628 Merge "Include misc_info.txt for super.img in dist"
am: da8bf47e68

Change-Id: I2982e396ffbf01c5cbed949773a68afa2b65c090
2019-08-23 00:58:36 -07:00
Isaac Chen
da8bf47e68 Merge "Include misc_info.txt for super.img in dist" 2019-08-23 07:35:52 +00:00
Elliott Hughes
a8368efe51 macOS calls itself Darwin.
Test: uname
Change-Id: Id3ce8614869e68c15666051af14321f597d6ae0f
2019-08-22 13:38:28 -07:00
Anton Hansson
7e274918c0 [automerger skipped] Merge "Remove stale artifact whitelist entries"
am: ffdeeae450 -s ours
am skip reason: change_id Ia495ed7b883fd100fdb75206c13cedb6fa62b0b2 with SHA1 5f7c08fbb3 is in history

Change-Id: I9c8554dabeffb02849b781e8efde6624a55b9e2d
2019-08-22 05:22:44 -07:00
Anton Hansson
ffdeeae450 Merge "Remove stale artifact whitelist entries" 2019-08-22 12:09:27 +00:00
Anton Hansson
1ce08094d3 Merge "Remove stale artifact whitelist entries" into stage-aosp-master 2019-08-22 10:59:22 +00:00
Dan Willemsen
86be07669f Merge "Remove package-stats.txt"
am: 1211130c92

Change-Id: I6be259692a3a25934f30595b7f23177c4f6b62bb
2019-08-21 23:51:21 -07:00
Treehugger Robot
1211130c92 Merge "Remove package-stats.txt" 2019-08-22 06:40:11 +00:00
Isaac Chen
52cc60ca15 Include misc_info.txt for super.img in dist
Include the misc_info.txt in "dist_files" so we can recreate a new
mixed super image (system and vendor images from different builds)
later in the test pipeline.

The misc_info.txt for products with BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE
set to true is removed from their update packages (essentially, reverts
aosp/976069) since the super_misc_info.txt created here can be used.

Bug: 139404128
Test: $ lunch aosp_x86-userdebug
      $ m dist
      $ diff $OUT_DIR/dist/super_misc_info.txt $OUT/misc_info.txt

Change-Id: Iad1ff981124a19933b0b575bc99941e0fc3813a7
2019-08-22 13:22:06 +08:00
Jeongik Cha
5f1eca2482 Merge "SYSTEM_EXT supports executables"
am: 6d52157f9d

Change-Id: I895dec8ff661e914fe35bc20e6a1ab1762037f9b
2019-08-21 18:31:10 -07:00
Treehugger Robot
6d52157f9d Merge "SYSTEM_EXT supports executables" 2019-08-22 01:07:20 +00:00
Jeff Sharkey
1d7c658611 Merge "Add "owngrep" shell utility."
am: fc587b926d

Change-Id: Ic3f94e08afadfb346cc032950996be2406ceacdf
2019-08-21 17:41:33 -07:00
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
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