Commit Graph

60471 Commits

Author SHA1 Message Date
Lorenzo Colitti
1db1982846 Merge "Revert "Master is now S"" into rvc-dev-plus-aosp 2020-04-22 16:25:31 +00:00
Remi NGUYEN VAN
dbe3f33f7a Revert "Master is now S"
This reverts commit de005e83f7.

Reason for revert: BuildCompat.isAtLeastR is broken: b/154661881

Change-Id: I4284c636ae26b45c0e7c715215778ef00e7bbab1
2020-04-22 07:32:44 +00:00
Treehugger Robot
b1923eabc0 Merge changes I465ea6c9,I57b77d7c am: be01cf841e am: 85ec063adf
Change-Id: I27699d706b0b4717c7687f38d838295848f0f768
2020-04-22 04:16:57 +00:00
Treehugger Robot
85ec063adf Merge changes I465ea6c9,I57b77d7c am: be01cf841e
Change-Id: I4b650bec84a2e21c2e5ef947839eb3d18ecc755c
2020-04-22 04:05:45 +00:00
Treehugger Robot
be01cf841e Merge changes I465ea6c9,I57b77d7c
* changes:
  generate multiple boot.img files in aosp_arm64
  create emulator_arm64 device for sdk_phone_arm64 to use
2020-04-22 03:45:49 +00:00
Victor Hsieh
365f10d96f [automerger skipped] Add fsverity release cert am: f17840d885 -s ours
am skip reason: Change-Id I6d8f4af6b1b0c023b668e81b7a1c71c7583d93d9 with SHA-1 d24991a26e is in history

Change-Id: Ifce9d579c504146a33e2dc91aca580895371baaf
2020-04-21 23:51:00 +00:00
Tianjie Xu
6c14671ba6 Merge "Update the argument when signing aftl" am: f53f313c36 am: 9ec3777b95
Change-Id: I53d38d4b8e990c957971be0de6c5032198310eaa
2020-04-21 23:12:04 +00:00
Dan Willemsen
d9bac7d4fc Merge changes from topic "mk-rm-obsolete" am: 85dbb754e2 am: fe4be56b3b
Change-Id: I8525036b627795b2e65e3f3671dd696ca8283e8c
2020-04-21 23:11:51 +00:00
Dan Willemsen
f08587c925 Remove AUX support am: 58634e1482 am: c4fb07d615
Change-Id: Ic54cef973b4573886a562690fe0d3c8b35816f4a
2020-04-21 23:11:48 +00:00
Tianjie Xu
9ec3777b95 Merge "Update the argument when signing aftl" am: f53f313c36
Change-Id: I7d820dfc64815784821eb07fd46eb1ff484faa86
2020-04-21 22:47:01 +00:00
Dan Willemsen
fe4be56b3b Merge changes from topic "mk-rm-obsolete" am: 85dbb754e2
Change-Id: I08617313fa97764bf5100274c81f669ab86db13c
2020-04-21 22:46:04 +00:00
Dan Willemsen
c4fb07d615 Remove AUX support am: 58634e1482
Change-Id: I979e3002653f5f862c536ec8f2b3f5c1c3991773
2020-04-21 22:46:01 +00:00
Tianjie Xu
f53f313c36 Merge "Update the argument when signing aftl" 2020-04-21 22:39:31 +00:00
Tianjie
20dd8f20b1 Update the argument when signing aftl
The arguments transparency_log_servers and transparency_log_pub_keys
have been merged. Update the caller in the OTA script accordingly.

Also disable the test to contact aftl server until we have
a public server.

Bug: 153940575
Test: check the argument
Change-Id: If6a7e7d644884d395c75c2fcdfd6aa7c2380d851
2020-04-21 22:38:55 +00:00
Dan Willemsen
85dbb754e2 Merge changes from topic "mk-rm-obsolete"
* changes:
  Obsolete unused module types
  Remove AUX support
2020-04-21 22:35:36 +00:00
Victor Hsieh
f17840d885 Add fsverity release cert
The release cert helps verifying CTS in a release build.

Bug: 153112812
Test: build, reboot, see a new key in /proc/keys
Change-Id: I6d8f4af6b1b0c023b668e81b7a1c71c7583d93d9
Merged-In: I6d8f4af6b1b0c023b668e81b7a1c71c7583d93d9
2020-04-21 15:03:41 -07:00
Dan Willemsen
a854a2c6fc Merge "Master is now S" into rvc-dev-plus-aosp 2020-04-21 20:24:05 +00:00
Jeongik Cha
a92ecd46cd Make RRO packages for system_ext
Until now, packages from system_ext don't create RRO packages, instead
it uses static overlay, but to make system_ext common, it should use
RRO.

Bug: 150820813
Test: m && check if there are RRO packages that use from system_ext apps
Change-Id: Id0ddb66adca07a6bb4dda66fbee49fd476ac5342
Merged-In: Id0ddb66adca07a6bb4dda66fbee49fd476ac5342
2020-04-20 13:59:52 +00:00
Treehugger Robot
958f84ba06 Merge "support multiple boot.img files in release tools" am: dd9690162f am: cb1cefee02
Change-Id: I79f9e6753e2d950442c7c14233e163b82fb4d645
2020-04-20 08:49:10 +00:00
Treehugger Robot
cb1cefee02 Merge "support multiple boot.img files in release tools" am: dd9690162f
Change-Id: I3769858b5ae77e42df2db2c14dc0eb5463bf51df
2020-04-20 08:30:27 +00:00
Treehugger Robot
dd9690162f Merge "support multiple boot.img files in release tools" 2020-04-20 08:13:36 +00:00
Steve Muckle
0959fbfd2e generate multiple boot.img files in aosp_arm64
Generate boot.img variants with different schemes for kernel compression
(gzip, lz4, none).

The boot image is removed from vbmeta for aosp_arm64 since it is
not possible currently to store the hashes of multiple variants of a
particular image. The GKI will be verified via VTS anyway.

Also remove some emulator-specific stuff from aosp_arm64.

Bug: 151094943
Change-Id: I465ea6c98d52e839284d51b246203f6b8dfb5566
2020-04-20 05:31:15 +00:00
Steve Muckle
1e1514a5ef create emulator_arm64 device for sdk_phone_arm64 to use
Changes are needed in generic_arm64 so that aosp_arm64 can be used to
distribute the GKI. These changes are incompatible with the emulator,
so modify the sdk_phone_arm64 product to use its own device.

Bug: 111538404
Change-Id: I57b77d7cbf503afffa8db45ad8b5ae635b4f4444
2020-04-20 05:30:25 +00:00
TreeHugger Robot
87866db91c [automerger skipped] Merge "Copy shared libraries used by tests in device-tests_host_shared-libs.zip." into rvc-dev am: 032c967caf -s ours
am skip reason: Change-Id Iac7cfe1310f2c63ace42272d41a54a032bc102bc with SHA-1 01e5ec2a21 is in history

Change-Id: I1aeb98727c313d5e27cb5c4d308f2d6c5f3ddffe
2020-04-20 00:42:51 +00:00
TreeHugger Robot
032c967caf Merge "Copy shared libraries used by tests in device-tests_host_shared-libs.zip." into rvc-dev 2020-04-20 00:28:06 +00:00
Anton Hansson
b023bb9260 [automerger skipped] Merge "Remove _API_FILE variables" into rvc-dev am: 9751cacff3 -s ours
am skip reason: Change-Id I31742e50d1af42fb899c7a3436af5647bd90cc47 with SHA-1 ac1887227d is in history

Change-Id: Ic80d9e2c1b563a28b07860635eb62f750e96e6f4
2020-04-19 08:13:49 +00:00
Anton Hansson
9751cacff3 Merge "Remove _API_FILE variables" into rvc-dev 2020-04-19 07:54:27 +00:00
Dan Willemsen
58634e1482 Remove AUX support
This was deprecated in R, which has now branched, and there aren't any
users on master.

Test: build-aosp_crosshatch.ninja is the same (except for the removal of the empty auxiliary target)
Test: treehugger
Change-Id: I306156ab7f91cd4a2258554b4215766c99cd12d1
2020-04-18 21:00:18 -07:00
Dan Willemsen
efee0692d4 Obsolete unused module types
These were deprecated in R, which has now branched, and there aren't any
users on master.

Test: build-aosp_crosshatch.ninja is identical
Test: treehugger
Change-Id: I6286880e45c0facbae56f9a16e8cfcbde12f121c
2020-04-18 21:00:18 -07:00
Jingwen Chen
e78b2df63c Merge "Use prebuilt dir variable for BISON_PKGDATADIR, instead of an absolute path." am: 5bc04cfa7d am: 782ceb4d76
Change-Id: Id4093abc1ecaa8fd8c772bbcc7fda1e78c901f76
2020-04-19 01:45:21 +00:00
Jingwen Chen
782ceb4d76 Merge "Use prebuilt dir variable for BISON_PKGDATADIR, instead of an absolute path." am: 5bc04cfa7d
Change-Id: Ie29a239950ab60ea4ded756cb29794e8682e20eb
2020-04-19 01:25:34 +00:00
Jingwen Chen
5bc04cfa7d Merge "Use prebuilt dir variable for BISON_PKGDATADIR, instead of an absolute path." 2020-04-19 01:03:46 +00:00
Paul Scovanner
8e01d93e86 Update Security String to 2020-06-05 am: a52a320ffd am: 298d2e652a
Change-Id: I397b84063a527d568d347449f61887a6033c48d2
2020-04-18 21:44:42 +00:00
Paul Scovanner
298d2e652a Update Security String to 2020-06-05 am: a52a320ffd
Change-Id: I335efbd36364ee5b71b95c048caf02565446584e
2020-04-18 21:17:20 +00:00
Jingwen Chen
e8befad090 Use prebuilt dir variable for BISON_PKGDATADIR, instead of an absolute path.
Test: m

Signed-off-by: Jingwen Chen <jingwen@google.com>
Change-Id: I329d8f685f60fd05727b65aecb82eb03807e9201
2020-04-18 14:38:25 +00:00
Anton Hansson
9d8c3965d1 Merge "Remove _API_FILE variables" am: c94417e9a7 am: 319874dc9c
Change-Id: I328d509e5797a4b3149aefd249d03b6951c0c44e
2020-04-18 10:02:41 +00:00
Anton Hansson
319874dc9c Merge "Remove _API_FILE variables" am: c94417e9a7
Change-Id: Ifff8acce94edc2138c0bd3c604392089ca2e4fce
2020-04-18 09:41:00 +00:00
Anton Hansson
9c07cec6a8 Remove _API_FILE variables
There are no known usages of these variables, and they've been
incorrectly set for a long time.

The phony for $(LOCAL_MODULE) in droiddoc to build the api txt
has been moved to soong.

Bug: 152479829
Test: m
Change-Id: I31742e50d1af42fb899c7a3436af5647bd90cc47
Merged-In: I31742e50d1af42fb899c7a3436af5647bd90cc47
2020-04-18 10:15:19 +01:00
Anton Hansson
c94417e9a7 Merge "Remove _API_FILE variables" 2020-04-18 09:13:49 +00:00
Treehugger Robot
a1ae3f60e1 Merge "Add fsverity release cert" am: 2162d25b8f am: db1f79e6d6
Change-Id: I135efa3133876d82b5c983e62f48dee1ef7641b5
2020-04-18 03:01:23 +00:00
Treehugger Robot
db1f79e6d6 Merge "Add fsverity release cert" am: 2162d25b8f
Change-Id: Ida1c00511fd2627ca5e448abf5eb55673d5a21e3
2020-04-18 02:37:15 +00:00
Treehugger Robot
2162d25b8f Merge "Add fsverity release cert" 2020-04-18 02:17:20 +00:00
Kousik Kumar
0a8b83d0cb Merge "Use soong_zip instead of jar to generate .jar files in javac actions" am: 1d56417af0 am: 2d1430e51c
Change-Id: Iec9836498edc164265b79034da7a75b588d65057
2020-04-17 22:41:01 +00:00
Kousik Kumar
2d1430e51c Merge "Use soong_zip instead of jar to generate .jar files in javac actions" am: 1d56417af0
Change-Id: I2d4af49bf3a300d3735fe5d1d6dce1a0d721f792
2020-04-17 22:14:56 +00:00
Kousik Kumar
1d56417af0 Merge "Use soong_zip instead of jar to generate .jar files in javac actions" 2020-04-17 21:51:31 +00:00
Anton Hansson
ac1887227d Remove _API_FILE variables
There are no known usages of these variables, and they've been
incorrectly set for a long time.

The phony for $(LOCAL_MODULE) in droiddoc to build the api txt
has been moved to soong.

Bug: 152479829
Test: m
Change-Id: I31742e50d1af42fb899c7a3436af5647bd90cc47
2020-04-17 20:27:41 +01:00
Victor Hsieh
d24991a26e Add fsverity release cert
The release cert helps verifying CTS in a release build.

Bug: 153112812
Test: build, reboot, see a new key in /proc/keys
Change-Id: I6d8f4af6b1b0c023b668e81b7a1c71c7583d93d9
2020-04-17 10:27:42 -07:00
Martijn Coenen
4b5ca2bb12 [automerger skipped] Merge changes from topic "emulated_storage_props" into rvc-dev am: bdd91a0c68 -s ours
am skip reason: Change-Id Id893ce19025ded1ee1521081f7fc722dfee8e662 with SHA-1 c5ce32b19a is in history

Change-Id: I8718025b582236fa52c2ecd6ba4ef41c2a6da0f4
2020-04-17 08:10:15 +00:00
Martijn Coenen
bdd91a0c68 Merge changes from topic "emulated_storage_props" into rvc-dev
* changes:
  Rename ro.emulated_storage properties.
  Move ro.emulated_storage properties to PRODUCT_PROPERTY_OVERRIDES.
2020-04-17 07:59:26 +00:00
Yo Chiang
b301fd5434 Merge "Check ELF prebuilts in PRODUCT_COPY_FILES" am: 2cbcf3bda2 am: 85e68e75f1
Change-Id: Ifb30cc6423b03d9468ec949ba862c61d70085f4f
2020-04-17 01:41:49 +00:00