Commit Graph

58240 Commits

Author SHA1 Message Date
Colin Cross e0c5e44360 Revert "Revert "Use sdk variant of Soong modules when LOCAL_SDK_..."
Revert^2 "Add sdk mutator for native modules"

f8e80229fedb47302e9cfd32990859a6308020cf

Change-Id: Ib686b52339ae5031434a2fb6a0e7f5b0c0dc5641
2020-04-07 16:50:32 +00:00
Vladimir Marko 385c9ae90f Merge "Pass /system/etc/updatable-bcp-packages.txt to dex2oat." 2020-04-07 07:34:14 +00:00
Treehugger Robot ddeddc819d Merge "Fix signing on some GSI targets" 2020-04-07 04:33:19 +00:00
Colin Cross 189a925c8b Merge "Revert "Use sdk variant of Soong modules when LOCAL_SDK_VERSION ..."" 2020-04-07 04:25:34 +00:00
Colin Cross 79e5a55122 Revert "Use sdk variant of Soong modules when LOCAL_SDK_VERSION ..."
Revert "Add sdk mutator for native modules"

Revert submission 1242911-sdk_version_variant

Reason for revert: b/153394225
Reverted Changes:
Ife99745fb:Use libnativewindow for platform variant of libagq...
I1bae84c43:Use libnativewindow for platform variant of androi...
I6e6021ed3:Use stl to depend on libc++
Ife99745fb:Use libnativewindow for platform variant of libRSS...
I2c9f439b9:Fix static dependency on libprotobuf-cpp-lite-ndk
Iff2aff9cf:Set sdk_version for cc_genrules used by modules wi...
I7d72934aa:Add sdk mutator for native modules
Ief378a007:Use sdk variant of Soong modules when LOCAL_SDK_VE...

Bug: 149591340
Change-Id: I6cd4de221ece29e48d58a8b1297dc2512b2dad13
Fixes: 153394225
2020-04-07 04:21:21 +00:00
Colin Cross a2af96b642 Merge "Use sdk variant of Soong modules when LOCAL_SDK_VERSION is set" 2020-04-07 01:52:10 +00:00
Jaewoong Jung 95445e6913 Add signing certificate lineage file support.
Also add multi-cert support to prebuilt apps so that they can benefit
from the new lineage feature.

(This is a cherry-pick change.)

Test: m GoogleServicesFramework w/ modified build rules
Test: m PrebuiltGmsCore w/ modified build rules
Test: apksigner lineage -v --print-certs -in <built_module_path>
Fixes: 152897457
Change-Id: If7d5d4bd308629c8340231520214c76c8a568a65
Merged-In: If7d5d4bd308629c8340231520214c76c8a568a65
2020-04-06 13:42:23 -07:00
Zhen Zhang 760e3768bb Merge "emulator: fix full-eng build on aosp" 2020-04-06 20:06:15 +00:00
bohu 0f9c766320 emulator: fix full-eng build on aosp
BUG: 153361966
Test: Build full-eng
Change-Id: I0e8f065cf875d19be705430c642922f2c9a39d76
2020-04-06 20:01:24 +00:00
Bo Hu ac74429171 Merge "emulator: enable vendor boot image" 2020-04-06 19:18:13 +00:00
Bill Peckham f6baf822ac Merge "Ensure that merge_target_files.py prints INFO level logs." 2020-04-06 19:00:56 +00:00
bohu 8fd437c80a emulator: enable vendor boot image
BUG: 149826779
Test: Build x86, x86_64, armv7 and arm64
make sure x86/64 boot to home screen;
armv7/arm64 can pass disk mounting stage

Change-Id: I258b69bd0cdc4fb0a99b1a04567051e8d32c389a
2020-04-06 14:05:28 +00:00
Vladimir Marko 09e885dc6d Pass /system/etc/updatable-bcp-packages.txt to dex2oat.
Test: aosp_taimen-userdebug boots.
Test: Check logcat for the new argument in the dex2oat
      invocations that happen on first boot.
Bug: 151314205
Change-Id: Id2a14c3810897ead213238b63aee5ff180b56397
2020-04-06 12:15:57 +01:00
Tianjie Xu 0889aaeeae Merge "Change the parameter type of offset in read" 2020-04-04 20:00:20 +00:00
Bill Peckham cb84817fdf Ensure that merge_target_files.py prints INFO level logs.
Bug: 153166596
Test: Run a merge build, inspect logs.
Change-Id: Ic2795f26922db32030c7ab7eb4ec6f153c1e9654
2020-04-04 04:20:45 +00:00
Bill Peckham 0447be9904 Merge "Make the `partition=` tag optional." 2020-04-04 04:12:35 +00:00
Bill Peckham 5c7b034a5c Make the `partition=` tag optional.
Since we might use ToT release tools to sign a package
generated by an older build, we make the new
`partition=` tag optional. This also means we need to be
careful to use non-greedy regex matching.

Bug: 153133823
Test: python3 -m unittest
Test: input with and without the new `partition=` tag
Test: new test_ReadApkCerts_WithWithoutOptionalFields
Change-Id: Ic57efd34e745ad302ae17150c6f2318f0b4524cb
2020-04-03 17:09:37 -07:00
Dan Shi 488d665d7d Merge "Rename vts-core to vts" 2020-04-03 22:47:23 +00:00
Dan Shi 48382eaa74 Merge "Cleanup VTS-Core and VTS10 related artifacts" 2020-04-03 21:32:12 +00:00
Dan Shi 4fd493dae1 Cleanup VTS-Core and VTS10 related artifacts
Bug: 151896491
Test: none
Change-Id: I5a42dcbe34866751a54f059d363f1866bff7d47a
Merged-In: I5a42dcbe34866751a54f059d363f1866bff7d47a
2020-04-03 10:16:21 -07:00
Treehugger Robot 40ddffe600 Merge "fix boot-test-harness.img build" 2020-04-03 15:33:31 +00:00
Tom Cherry 8c7a4f6fc1 Merge "Include private/fs_config.h directly when needed" 2020-04-03 14:36:58 +00:00
Kousik Kumar 1493444674 Merge "Update configuration for RemoteExecution actions" 2020-04-03 13:48:40 +00:00
Anton Hansson a0ef52302e Merge "Reland: Remove empty newline in build.prop" 2020-04-03 11:58:17 +00:00
Steve Muckle 4866bd6bff fix boot-test-harness.img build
The recently added support for multiple kernels and boot.img files
missed the boot-test-harness.img.

Bug: 152464066
Change-Id: I6e146a0702bc933e0b62f36dc34aba913e57316f
2020-04-02 12:37:04 -07:00
Kousik Kumar 3fd528e215 Update configuration for RemoteExecution actions
1. Specify addition inputs needed for R8 / D8 / Javac actions so that
they can be successfully executed remotely.
2. Cleanup platform configuration so that pool-names are turned into a
common variable and re-used between javac / r8 / d8 actions.

Bug: b/152273259
Change-Id: I0231a96f6e4e094e98d0f89728f6ac3e34f78118
Merged-In: I0231a96f6e4e094e98d0f89728f6ac3e34f78118
2020-04-02 12:07:47 -07:00
Tianjie Xu 2995096483 Merge "Add aftltool is a signing parameter" 2020-04-02 18:09:59 +00:00
Tianjie 2751d2b8f3 Change the parameter type of offset in read
As we support zip64 in libziparchive, we change the parameter of
the ReadAtOffset() in zip reader from uin32_t to off64_t. So the
derived class needs to be updated as well.

Bug: 150900468
Test: build
Change-Id: Icbfd2dd54b01ff62da988ba8598c1057f9bb6368
2020-04-02 06:16:43 +00:00
Kiyoung Kim 39197f846b Merge "Build required modules from default" 2020-04-02 06:14:43 +00:00
Dan Shi 155ffd4179 Rename vts-core to vts
Bug: 151896491
Test: local build
Change-Id: I17dc5cfeb0d47618201c58af0c9bdb1b7d0a1421
2020-04-01 13:07:15 -07:00
Tianjie 0f3074566c Add aftltool is a signing parameter
Right now we assert that the aftltool should exist since the one
in aosp won't work due to grpc dependencies.

Bug: 147870995
Test: build
Change-Id: Iabb2c375167572a965493a7648fdc1abe287af67
2020-04-01 12:20:21 -07:00
Youkichi Hosoi f6652f4f18 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
2020-04-02 03:34:49 +09:00
Daniel Norman 63a16b56ee Merge "Adds the module from package-modules to ALL_MODULES." 2020-04-01 16:30:51 +00:00
Kiyoung Kim 0a8d26210e Build required modules from default
Some required modules from host tool (such as imgdiff) are bound to
required from releasetools_common, but unfortunately required modules
from python_library_host does not work (b/140144201). To make this work
we should mark dependency from each host tool.

Bug: 152258157
Test: Build succeeded without system image
Change-Id: Iedfda9b48d78687d8f622b818eeb93896d4f119d
2020-04-01 14:21:01 +00:00
Nikita Ioffe f26b9c8c33 Merge "Make init.userspace_reboot.is_supported a rw property" 2020-04-01 13:14:21 +00:00
Luca Stefani 033c7eb82f Reland: Remove empty newline in build.prop
Before:
cat build.prop

\# begin common build properties
\# autogenerated by build/make/tools/buildinfo_common.sh

After
cat build.prop
\# begin common build properties
\# autogenerated by build/make/tools/buildinfo_common.sh

Change-Id: I8365bb59ad22a3bd9fc1dc904ff2026ddd7abe06
Test: m
2020-04-01 12:55:27 +02:00
android-build-team Robot c9aad37982 Version bump to QQ2A.200501.001.B2 [core/build_id.mk]
Change-Id: I474bf28ef86c76dd604fbece203c15a91e7ce92a
2020-04-01 00:06:15 +00:00
Daniel Norman 1d18d5366e Adds the module from package-modules to ALL_MODULES.
This exposes any modules built with package-modules.mk to
module-info.json.

Test: refreshmod, inspect module-info.json and find new modules
      from platform_testing/build/tasks/*
Bug: 151670189
Change-Id: I8d502382640f4d49ab2c17fcc251e54720844b76
2020-03-31 16:49:39 -07:00
Tianjie Xu a3541df291 Merge "Add aftl inclusion proof" 2020-03-31 22:12:46 +00:00
Bo Hu c969dcc0b2 Merge "Revert "Remove empty newline in build.prop"" 2020-03-31 21:27:21 +00:00
Bo Hu 76a005da8d Revert "Remove empty newline in build.prop"
This reverts commit 96a79c6f65.

Reason for revert: b/152899887
original cl leads to build.prop getting longer and longer
from 60+ to 1k+ lines and keep increasing

Exempt-From-Owner-Approval:
BUG: 152899887

Change-Id: I83ed1702009278014c77d7e7a7305756041564de
2020-03-31 21:26:58 +00:00
Dan Shi 916be61b91 Merge "Rename VTS to VTS10" 2020-03-31 17:32:34 +00:00
Bill Peckham ad10b96768 Merge "Build merged apexkeys.txt/apkcerts.txt by partition." 2020-03-31 13:42:30 +00:00
Jiyong Park 0b7b97bfc3 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.

Bug: 151303316
Test: m
Change-Id: I7106ac236770b55b147c8a7f524bc2eddbddedb1
2020-03-31 17:04:54 +09:00
Nikita Ioffe bb9699c2e1 Make init.userspace_reboot.is_supported a rw property
General recommendation is to avoid read-only properties, and instead control
"read-onlines" by only allowing init/vendor_init to set the property.

Since ro.init.userspace_reboot.is_supported was added in this release, and
nobody outside of the platform is querying it directly, it should be fine to
simply rename it.

Test: adb shell getprop init.userspace_reboot.is_supported
Test: atest CtsUserspaceRebootHostSideTestCases
Bug: 152803929
Change-Id: Ie3604b315a5d2a846037064ad9a29258f2cad9d0
2020-03-30 23:42:18 +01:00
Bill Peckham 19c3feb2d3 Build merged apexkeys.txt/apkcerts.txt by partition.
Propagate partition tag data to apexkeys.txt and
apkcerts.txt so that merge_target_files.py can build
merged versions of these files by filtering the
framework files for framework partitions and filtering
the vendor files for vendor partitions.

Bug: 138942268
Change-Id: Ic3226728e97dae84d38ec230ccc86d1b124bea94
2020-03-30 22:33:27 +00:00
Oliver Nguyen 337f42e7d1 Merge "Export llvm-profdata for Clang coverage builds." 2020-03-30 20:38:22 +00:00
Peter Collingbourne d78f96ee20 Merge "Remove crash_dump from PRODUCT_PACKAGES." 2020-03-30 19:03:42 +00:00
Orion Hodson 8459ede56d Merge "Update dex2oat filter" 2020-03-30 13:05:22 +00:00
Orion Hodson 70fcf897c5 Update dex2oat filter
verify-at-runtime is deprecated in favor of extract. Update to
stop deprecation warnings during OTAs.

Exempt-From-Owner-Approval: cherry-pick from rvc-dev

Bug: 149794809
Test: manual OTA
Change-Id: I9b8365a1fba5fd18420661a3e6ada77f3609bcc7
Merged-In: I9b8365a1fba5fd18420661a3e6ada77f3609bcc7
(cherry picked from commit db651d5913)
2020-03-30 13:03:47 +00:00