Commit graph

59649 commits

Author SHA1 Message Date
TreeHugger Robot
effb247999 Merge "Extend static_whitelist_patterns" into rvc-dev 2020-04-28 10:32:47 +00:00
Jeongik Cha
62b9892916 Exempt RRO from the restriction on API level
As auto generated RRO, an arbitrary RRO needs to be exempted as well.
It is okay because RRO packages can access only resource defined in
public.xml, when RRO packages want to refer other package's resource.

Bug: 152926556
Test: build RRO packages
Test: check if product/vendor app still can't use hidden APIs
Merged-In: I8dc2922af5eb5c87ccd97d1b8d080b3ed48cf9a6
Change-Id: Ief10b3535d4eb9f6607cac31cba1b4d3e081efd0
(cherry picked from commit 07a44f48dc)
2020-04-28 10:25:41 +09:00
Tianjie Xu
2ca6aa0f4e Merge "releasetools: Add missing log format specifier" into rvc-dev 2020-04-27 22:59:54 +00:00
Dan Shi
5d26aa2587 Merge "[VTS] copy ltp and kselftest to testcase folder" into rvc-dev 2020-04-27 22:58:50 +00:00
Jeongik Cha
e1cee9a8df Clean up static_whitelist_patterns
$(HOST_OUT)/% is not necessary anymore.

Bug: 148993225
Test: m nothing
Change-Id: If2551283ebb6c516c029d1c04aebe25661bc6a1a
Merged-In: If2551283ebb6c516c029d1c04aebe25661bc6a1a
Merged-In: I7503c007c3e786b0cab26ea1422f0d4ba5a40662
2020-04-27 22:44:16 +00:00
TreeHugger Robot
2f40f1727c Merge "enable BOARD_EXT4_SHARE_DUP_BLOCKS for generic_arm64" into rvc-dev 2020-04-27 22:43:45 +00:00
Colin Cross
17c7264f44 Don't install test suite files from uninstallable modules
Don't copy tests or test data to the test suite directories if the
module is marked LOCAL_UNINSTALLABLE_MODULE := true.

Fixes: 153758132
Test: m checkbuild
Change-Id: Ibdf18807a2ffe9bb352d74880a802ad55b57f154
Merged-In: Ibdf18807a2ffe9bb352d74880a802ad55b57f154
(cherry picked from commit fca369e4e3)
2020-04-27 14:57:49 -07:00
Colin Cross
dc7bc5d8bf Use sdk variant of Soong modules when LOCAL_SDK_VERSION is set
Soong now makes a variant of native modules that set sdk_version.
Use the new variant for native modules or apps with JNI that are
defined in Make and set LOCAL_SDK_VERSION.

Test: m checkbuild
Bug: 149591340
Change-Id: Ief378a007e43b0aea31fd5845410bbffec0ffae6
Merged-In: Ief378a007e43b0aea31fd5845410bbffec0ffae6
(cherry picked from commit b934116994)
2020-04-27 14:35:20 -07:00
Dan Shi
737711d9dc [VTS] copy ltp and kselftest to testcase folder
Bug: 154446791
Test: m -j vts_kernel_tests vts
Change-Id: I405c227293085d3fd0603e9eba5ce276d7dc14d5
Merged-In: I405c227293085d3fd0603e9eba5ce276d7dc14d5
2020-04-27 21:31:55 +00:00
Steve Muckle
125b6d6eea enable BOARD_EXT4_SHARE_DUP_BLOCKS for generic_arm64
Bug: 154907226
Change-Id: Iab55afbfaf7d28ac0e826f8eb94b113a2780a4c9
Merged-In: Iab55afbfaf7d28ac0e826f8eb94b113a2780a4c9
2020-04-27 13:52:28 -07:00
Luca Stefani
7f4ca3ac04 releasetools: Add missing log format specifier
bug: 154786239
Test: m otapackage
Change-Id: I273cf315400dd2b624d2853ece0c30c6fb3d529d
(cherry picked from commit 88e1a14523)
2020-04-27 20:50:27 +00:00
Ulyana Trafimovich
9b36bb4632 Merge "Add PRODUCT_SYSTEM_SERVER_JARS_EXTRA interface" into rvc-dev 2020-04-27 08:22:01 +00:00
Rock.Yeh
3c21474100 Add PRODUCT_SYSTEM_SERVER_JARS_EXTRA interface
This interface allows vendor to append their system server jars after AOSP's
without changing inherit order.

Test: booting
Test: build pass on branch r-fs-release with this patch
Bug: 140712566
Change-Id: I0ddf35bdf725c262f817985f5494b5968db21fcd
Merged-In: I0ddf35bdf725c262f817985f5494b5968db21fcd
(cherry picked from commit 2a703ce2f6)
Exempt-From-Owner-Approval: cherry-pick
2020-04-27 08:21:22 +00:00
Jeongik Cha
034cd871ae Extend static_whitelist_patterns
product-installed-files generates more default artifacts than
$(call module-installed-files,$(call auto-included-modules)),
and it causes problems when we try to apply this mechanism to other
partition

So use product-installed-files with an empty parameter as static
whitelist

Test: apply require-artifacts-in-path to other partition(or path),
      and then, m nothing
Test: add system module outside mainline_system.mk, and check if there is error.

Bug: 148993225
Change-Id: Ie110f20ff833229b23a777ff1decb32f84b9cef7
Merged-In: Ie110f20ff833229b23a777ff1decb32f84b9cef7
2020-04-26 16:29:46 +09:00
Baligh Uddin
8424f2e56c Allow passing in codename_to_api_level_map to sign_apex.
BUG: 154517483
Change-Id: I93a90ae066b0e9eeb1b2ff26d9cb9b07a11fe68c
2020-04-25 18:30:24 +00:00
Treehugger Robot
5d979e29cf Remove phony target vts-core
The target has been removed from all builders.

Bug: 151896491
Test: none
Change-Id: I5d1b1058b18153c9cedb33b151dec8daab3e2e57
Merged-In: I5d1b1058b18153c9cedb33b151dec8daab3e2e57
2020-04-24 21:52:47 +00:00
TreeHugger Robot
04735a8ef2 Merge changes I465ea6c9,I57b77d7c,I536a286d,Ie16a7bf7 into rvc-dev
* changes:
  generate multiple boot.img files in aosp_arm64
  create emulator_arm64 device for sdk_phone_arm64 to use
  support multiple boot.img files in release tools
  multi boot.img support cleanups
2020-04-23 23:20:16 +00:00
TreeHugger Robot
c0f3be1309 Merge "Make RRO packages for system_ext" into rvc-dev 2020-04-23 01:25:48 +00:00
Oliver Nguyen
e213117fae Merge "Export llvm-profdata for Clang coverage builds." into rvc-dev 2020-04-22 21:26:09 +00:00
Steve Muckle
4b6b2003a9 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
Merged-In: I465ea6c98d52e839284d51b246203f6b8dfb5566
2020-04-22 11:48:52 -07:00
Steve Muckle
4bfa078008 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
Merged-In: I57b77d7cbf503afffa8db45ad8b5ae635b4f4444
2020-04-22 11:48:14 -07:00
Steve Muckle
f83e3c3c3f support multiple boot.img files in release tools
Support for generating multiple boot.img files is required in the
release tools to enable GKI distribution/signing.

Bug: 151094943
Change-Id: I536a286d3123f35918106a52c49b1148d746370f
Merged-In: I536a286d3123f35918106a52c49b1148d746370f
2020-04-22 11:14:05 -07:00
Steve Muckle
8f670ebae7 multi boot.img support cleanups
The kernel should not be specified in INTERNAL_RECOVERYIMAGE_ARGS, since
it is already given to mkbootimg directly.

The MKBOOTIMG_KERNEL_ARG macro is unused.

Bug: 151094943
Change-Id: Ie16a7bf7d77c0436d933abbb02c6dcb9202d5fe7
Merged-In: Ie16a7bf7d77c0436d933abbb02c6dcb9202d5fe7
2020-04-22 11:13:43 -07:00
Oliver Nguyen
389cd00ca0 Export llvm-profdata for Clang coverage builds.
This tool must match the one used to compile the source code for
compatibility.

Bug: 143977934
Test: m CLANG_COVERAGE=true dist
Merged-In: I71e0e7afb05dedd5f6a09d5e4099387c6262387f
Change-Id: I71e0e7afb05dedd5f6a09d5e4099387c6262387f
(cherry picked from commit b02f7dbaa4)
2020-04-22 10:20:55 -07: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
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
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
9751cacff3 Merge "Remove _API_FILE variables" into rvc-dev 2020-04-19 07:54:27 +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
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
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
easoncylee
dde942ca88 Copy shared libraries used by tests in device-tests_host_shared-libs.zip.
This change collects the shared libraries files used by tests in
device-tests_host_shared-libs.zip. Then the host test can be run in
TradeFed host based on build artifacts.

Bug: 151172861
Test: m -j device-tests
Change-Id: Iac7cfe1310f2c63ace42272d41a54a032bc102bc
Merged-In: Iac7cfe1310f2c63ace42272d41a54a032bc102bc
2020-04-17 08:18:12 +08:00
Maciej Zenczykowski
a11cf8fd7b Merge "remove dependency on ip6tables" into rvc-dev 2020-04-16 17:59:18 +00:00
Maciej Żenczykowski
364844c369 remove dependency on ip6tables
which is now (as of aosp master external/iptables @ HEAD, ie.
  https://android-review.googlesource.com/c/platform/external/iptables/+/1284244
) simply a symbolic link to iptables binary

This should fix:
  > FAILED:
  > build/make/core/main.mk:1132: warning:  build/make/target/product/generic.mk includes non-existent modules in PRODUCT_PACKAGES
  > Offending entries:
  > ip6tables
  > build/make/core/main.mk:1132: error: Build failed.

Test: No, but building, and treehugging
Bug: 154186169
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I94709a7450d0c41a64951c592b54de4b2956eae9
Merged-In: I94709a7450d0c41a64951c592b54de4b2956eae9
2020-04-16 13:54:51 +00:00
Martijn Coenen
7b9fef4a75 Rename ro.emulated_storage properties.
Whether these are enabled or not is independent of whether storage is
emulated or not; instead, use 'external_storage', and add the enabled
suffix as per property naming guidelines.

Bug: 152170470
Bug: 153525566
Test: N/A
Change-Id: Id893ce19025ded1ee1521081f7fc722dfee8e662
Merged-In: Id893ce19025ded1ee1521081f7fc722dfee8e662
2020-04-16 12:56:57 +00:00
Martijn Coenen
5afd62fb91 Move ro.emulated_storage properties to PRODUCT_PROPERTY_OVERRIDES.
These need to be a part of the vendor partition and be set even when
using GSI.

Bug: 152170470
Bug: 153525566
Test: android.drm.cts.DRMTest#testForwardLockAccess
Change-Id: I1e69d5c203d4f7480a6651ca780fbd307ce71c23
Merged-In: I1e69d5c203d4f7480a6651ca780fbd307ce71c23
2020-04-16 12:56:39 +00:00
Youkichi Hosoi
cc39735e55 strings.mk: Allow empty RHS values for inputs of collapse-pairs
This CL is to make the function collapse-pairs(), which is applied to
lists of "property=value" pairs, allow empty properties (i.e. lines of
the form "empty.prop=").
Currently, the function only allows empty properties at the end (see
https://android-review.googlesource.com/c/platform/build/+/722908).
So empty properties in the middle result in broken property files (e.g.
"a=b c= d=e" is transformed to "a=b c=d=e", in which the property "c",
which originally has no value, is interpreted as having the value "d=e",
whereas the property "d", which originally has the value "e", is missing
from the resulting property file).
This CL revises the function so as to keep empty properties in the
middle as is (e.g. it returns "a=b c= d=e" for the above example), while
preserving the behavior for well-formed lists like "a=b c= d e = f".

Bug: 152379493
Test: make
Change-Id: I35faeaedc3bc42e56e01201baf7ea6805a610439
Merged-In: I35faeaedc3bc42e56e01201baf7ea6805a610439
(cherry picked from commit f6652f4f18)
2020-04-16 15:45:40 +09:00
Dan Shi
5e7b3f429d Include shared host liraries in test suite zip
Bug: 151194160
Test: m -j vts && \
  ls out/host/linux-x86/vts/android-vts/testcases/lib64/
Change-Id: I7ebc4bf392d4c0f27478607846974631390097f8
Merged-In: I7ebc4bf392d4c0f27478607846974631390097f8
2020-04-15 06:24:49 +00:00
TreeHugger Robot
ebd9e253ab Merge "Enable non-v3 recovery image with v3 boot image" into rvc-dev 2020-04-15 01:12:29 +00:00
Steve Muckle
759d0c8cb2 Enable non-v3 recovery image with v3 boot image
Add support for building a non-v3 recovery image along with a
v3 boot.img and vendor_boot image.

Bug: 150825361
Change-Id: I80d4e71ff09b83dd1c7f9accb4de99a30f95f4bf
Merged-In: I80d4e71ff09b83dd1c7f9accb4de99a30f95f4bf
2020-04-14 15:40:01 -07:00
Jiyong Park
198e9ae373 Merge "libselinux is LLNDK, not VNDK-core" into rvc-dev 2020-04-14 02:18:24 +00:00
Paul Scovanner
a52a320ffd Update Security String to 2020-06-05
Bug: 153882927

Change-Id: I115a68d442f4f3922f0353fae1aae3bf1c057903
2020-04-13 23:40:37 +00:00
Paul Scovanner
e1e01d0b39 Update Security String to 2020-06-01 am: 388e683934
Change-Id: Ib45fbdf3e879361291fe440a4d0534f28fbd5cff
2020-04-13 23:25:19 +00:00
Paul Scovanner
388e683934 Update Security String to 2020-06-01
Bug: 153882927

Change-Id: Ibae64bd6c82ddb1afc801550fd7c4ac7bceeb4cc
2020-04-13 18:48:53 +00:00
Jiyong Park
086c5238ad libselinux is LLNDK, not VNDK-core
libselinux has stable C APIs and therefore provides a stub library for
Mainline clients. It is not copied into any Mainline modules and the
only instance of the lib in /system/lib serves all of them.

However for vendors, we still had another copy of libselinux in VNDK
(e.g. in the VNDK APEX that is served via the path /system/lib/vndk).
Since the library is guaranteed to have stable C APIs, there is no
reason to keep the vendor variant of the library in VNDK. Keeping it in
VNDK would be just a waste of storage space.

This change removes libselinux from VNDK and marks it as LLNDK. The
single instance of if in /system/lib serves vendor processes as well as
Mainline modules.

Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 151303316
Test: m
Merged-In: I7106ac236770b55b147c8a7f524bc2eddbddedb1
(cherry picked from commit 0b7b97bfc3)
Change-Id: I7106ac236770b55b147c8a7f524bc2eddbddedb1
2020-04-13 13:08:31 +09:00
Julien Desprez
e51409b68e Merge "Move build number file to out/soong" into rvc-dev 2020-04-09 18:56:01 +00:00
Automerger Merge Worker
aeca4e212e Move build number file to out/soong
Move the build number file to out/soong so Soong can treat it
as an output path, and pass the name of the file to Soong instead
of the command to read it.

Test: m checkbuild
Change-Id: I9e1aecf33d11fe4fde34cd57cc9b1f1ad49b0424
Bug: 153071808
Merged-In: I9e1aecf33d11fe4fde34cd57cc9b1f1ad49b0424
2020-04-09 08:15:37 -07:00
Jooyung Han
abe575d17b Remove PLATFORM_VERSION_FUTURE_CODENAMES
It has been wrong to split ALL_VERSIONS into exclusive two sets of
before/after TARGET_PLATFORM_VERSION.

And PLATFORM_VERSION_ALL_CODENAMES supports all *active* list of
non-finalized codenames.

Bug: 152960049
Test: m
Change-Id: I1e87206a7f261e587cf079cb6b7025ca16aa4fe4
2020-04-08 09:18:51 +09:00
TreeHugger Robot
870dbc02c9 Merge "Rename vts-core to vts" into rvc-dev 2020-04-07 19:00:26 +00:00
Vladimir Marko
9db698f341 Merge "Pass /system/etc/updatable-bcp-packages.txt to dex2oat." into rvc-dev 2020-04-07 12:15:00 +00:00