Commit Graph

59350 Commits

Author SHA1 Message Date
Automerger Merge Worker 16b3ff3727 Merge "Make oemaids_headers available to vendor." am: 8e28db7acc am: c9d21efbbf am: b46724c634
Change-Id: I3a07016189e1ba5537a0a44b78e1fcb8fb53a8fa
2020-02-18 21:23:57 +00:00
Automerger Merge Worker b46724c634 Merge "Make oemaids_headers available to vendor." am: 8e28db7acc am: c9d21efbbf
Change-Id: Ia36930f5dd136b7cfae9497077e81bc7242092f3
2020-02-18 21:09:34 +00:00
Tom Cherry c9d21efbbf Merge "Make oemaids_headers available to vendor." am: 8e28db7acc
Change-Id: I9658f35fe0e12c54b7cc8519d8b391a28207ca6f
2020-02-18 20:54:58 +00:00
Tom Cherry 8e28db7acc Merge "Make oemaids_headers available to vendor." 2020-02-18 19:19:22 +00:00
P.Adarsh Reddy 8b2e7c9c51 Make oemaids_headers available to vendor.
This change makes the oemaids_headers header library
available to vendor side.

Bug: 149665231
Test: Tested compilation, oemaids_headers is available to
a sample vendor binary.

Change-Id: I87369f1db883e40e83d6076defdd4c0d84aac46f
2020-02-18 09:44:23 +00:00
Bowgo Tsai 6a68367e6e Adding vendor_boot-debug.img
Commit I30137c3caef91805d9143d404e5e4d06c0fccc30 adds boot-debug.img
to allow adb root with an user build GSI image.

  https://source.android.com/compatibility/vts/vts-on-gsi

Another commit I5b005097b73f59857c3a2f92d693b3e67ee8424e adds
vendor_boot.img to pair with a generic kernel image, the GKI boot.img.

To allow adb root for devices using a GKI, vendor_boot-debug.img is
introduced. The image combination used in VTS will be:

    Old devices without GKI:
      GSI system.img + boot-debug.img + vendor.img, etc.

    New devices with GKI:
      GSI system.img + GKI boot.img + vendor_boot-debug.img + vendor.img, etc.

Note that boot-debug.img still can be used on new devices for
non-compliance scenario.

Bug: 147849477
Test: lunch aosp_cf_x86_64_phone-userdebug; make vendorbootimage_debug
Test: `make dist`, checks that both vendor_boot-debug.img and
      vendor-ramdisk-debug.cpio.gz are in $OUT/ and out/dist.
Test: `make dist`, checks that installed-files-vendor-ramdisk-debug.{json,txt} are
       in $OUT/ and out/dist.
Change-Id: I66b662d8b1e5c619ed7bb81e40233fe9df363b27
2020-02-18 13:46:17 +08:00
Kyriakos Ispoglou f00a0dbffc Add a new make target called `haiku-line-coverage`
This CL adds a new make target for line coverage, That is, by running
`make haiku-line-coverage` you can get a set of all profile (*.gcno) files
for all fuzz targets and for all critical components of Android,
packed into a zip called `line_coverage_profiles.zip`. Furthermore the set of
all fuzz targets are instrumented with line coverage and packed into
another zip called `line_coverage_fuzz_targets.zip`

To properly run the make target enable NATIVE_LINE_COVERAGE first:
NATIVE_LINE_COVERAGE=true NATIVE_COVERAGE=true COVERAGE_PATHS=* make haiku-line-coverage

Bug: b/148234755
Test: Make target buils successfully on master/aosp. Binaries tested on taimen
devices.

Change-Id: I6a1e11068119337628c2ae5ee3baf2fc394add05
2020-02-17 11:18:11 -08:00
Steven Moreland 2bf4726f18 Shipping >= API Level 30: no vndservicemanager.
Make this device configuration instead. Vendor implementations can
choose to use this, but it's not required.

Bug: 148807371
Test: TH will test CF boots
Change-Id: Ic144b1aa36e35295fccd9fa7f7f911587bf39bee
2020-02-14 16:57:08 -08:00
Treehugger Robot a8a48af27d [automerger skipped] Merge "Move packages from *_product.mk to *_system_ext.mk" am: ae541174cc am: 1d18ae8e7d am: 3d97e10186 -s ours
am skip reason: Change-Id I0aba1343b0342887f4bc5bc1cff47f96d4803214 with SHA-1 82c0e3e268 is in history

Change-Id: Id8900ec227bc803a41607b919004df4f883a1487
2020-02-14 22:57:09 +00:00
Treehugger Robot 3d97e10186 Merge "Move packages from *_product.mk to *_system_ext.mk" am: ae541174cc am: 1d18ae8e7d
Change-Id: I7c72a7cef7ac186c8fd672f2924c06346f4345d9
2020-02-14 22:33:48 +00:00
Treehugger Robot 1d18ae8e7d Merge "Move packages from *_product.mk to *_system_ext.mk" am: ae541174cc
Change-Id: I462fe07fb4d90fa58f1042adcc8fb2a94caf41fe
2020-02-14 22:11:52 +00:00
Treehugger Robot ae541174cc Merge "Move packages from *_product.mk to *_system_ext.mk" 2020-02-14 21:56:40 +00:00
Colin Cross d81f4b3461 Support empty jacoco-report-classes.jar
If EMMA_INSTRUMENT is turned on but no APKs were built the rule to
collect jacoco-report-classes.jar would error with missing directories
and an empty zip file.  Switch to soong_zip, which doesn't error
on empty zip files, and hide the errors if $(TARGET_COMMON_OUT_ROOT)
or $(HOST_COMMON_OUT_ROOT) don't exist.

Test: m EMMA_INSTRUMENT=true TARGET_BUILD_APPS=Camera2
Change-Id: I09e30e37dc38f32f55b3f91bfc4d12c9e753083f
2020-02-14 10:36:47 -08:00
Ivan Lozano 827a75c716 Merge "Remove execute-only support." am: c6a34608d0 am: 1a013b86f8 am: e6283a2974
Change-Id: I4538fae638e77f72560b179728c8ca9b2c9ec12a
2020-02-14 15:26:59 +00:00
Ivan Lozano e6283a2974 Merge "Remove execute-only support." am: c6a34608d0 am: 1a013b86f8
Change-Id: I361b5e883f6516a5a78db47924f155d240697cc2
2020-02-14 15:10:05 +00:00
Ivan Lozano 1a013b86f8 Merge "Remove execute-only support." am: c6a34608d0
Change-Id: I156d986e19075c5c21218f94138774ece0460ece
2020-02-14 14:56:52 +00:00
Ivan Lozano c6a34608d0 Merge "Remove execute-only support." 2020-02-14 14:42:49 +00:00
evitayan 1173332eb2 Load ike in system server classpath instead of bootclasspath
Module IPsec(IKE) will be built as a java_sdk_library and will not
be in bootclasspath anymore. It will be loaded in system sevrer
classpath so that it can be used by VPN.

Bug: 145995723
Test: build, flash, boot
Test: atest FramewokrsIkeTests (passed)
Test: m mts && mts-tradefed run mts-ipsec (passed)
Test: manually tested that it is loaded in system server
Change-Id: I3126605613202b1e981b4e7f594acb6edbb7d635
2020-02-13 17:24:19 -08:00
Ivan Lozano 3cd1ebeaee Remove execute-only support.
With kernel support being removed for execute-only memory layouts,
remove support for XOM until there's kernel support again.

This allows us to gain the code-size improvements from
"-z noseparate-code".

Bug: 147300048
Test: Compiled binaries no longer marked XOM by default.

Change-Id: I08a054e903b202f513d3b3381afd606bb87cf257
2020-02-13 14:20:28 -05:00
Automerger Merge Worker 4e3bceed4d Merge "build_image: check value of "ext4_share_dup_blocks"" am: 9021d5c4b4 am: d6437ec539 am: 74f2a0ec45
Change-Id: I18aaea958e048d07fc9daf91ca721169243a8c88
2020-02-13 16:46:22 +00:00
Automerger Merge Worker e93694fb90 Merge "Modify D8 template to not have inputs under the output directory." am: 8e3f73576f am: 9c2afcf9c6 am: 451879d2de
Change-Id: I85c6a195c345c7799cc6ed2df22dd30320b76a2e
2020-02-13 16:46:10 +00:00
Automerger Merge Worker 74f2a0ec45 Merge "build_image: check value of "ext4_share_dup_blocks"" am: 9021d5c4b4 am: d6437ec539
Change-Id: Ifd79436514aadddaa64e9a040847467ea6fb4c04
2020-02-13 16:30:59 +00:00
Automerger Merge Worker 451879d2de Merge "Modify D8 template to not have inputs under the output directory." am: 8e3f73576f am: 9c2afcf9c6
Change-Id: I4e250f8f8412cb151e428f491e48fb861112f6e7
2020-02-13 16:30:50 +00:00
Automerger Merge Worker d6437ec539 Merge "build_image: check value of "ext4_share_dup_blocks"" am: 9021d5c4b4
Change-Id: I5a7520122c6d6d43d5ddd882a0cdb1cad74d81a6
2020-02-13 16:20:11 +00:00
Automerger Merge Worker 9c2afcf9c6 Merge "Modify D8 template to not have inputs under the output directory." am: 8e3f73576f
Change-Id: Id3e17717fea5c99624dba7cad5c79ec6dda8f603
2020-02-13 16:20:01 +00:00
Colin Cross 9021d5c4b4 Merge "build_image: check value of "ext4_share_dup_blocks"" 2020-02-13 16:10:02 +00:00
Ramy Medhat 8e3f73576f Merge "Modify D8 template to not have inputs under the output directory." 2020-02-13 16:09:49 +00:00
Automerger Merge Worker d08f3c9332 [automerger skipped] Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." am: 0445b496c1 am: 0296ecb601 am: 81dde7dac3 -s ours
am skip reason: Change-Id Ief8994cc34cb6f7951051313dd66a1334a3a73b4 with SHA-1 19ed3a0db7 is in history

Change-Id: Iaf27fa0088e6aced97f52d7f11a0fc4496ee80b6
2020-02-13 14:15:14 +00:00
Automerger Merge Worker 81dde7dac3 Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." am: 0445b496c1 am: 0296ecb601
Change-Id: I61cfc99b2e7af60c1603506bb8e1243a9af29808
2020-02-13 14:01:31 +00:00
Automerger Merge Worker 0296ecb601 Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." am: 0445b496c1
Change-Id: I21b704bfee4d8b9b49cc4b06444001bcf0e97f58
2020-02-13 13:48:33 +00:00
Ulyana Trafimovich 0445b496c1 Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." 2020-02-13 13:36:25 +00:00
Ulya Trafimovich 36101543e9 Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint.
This is to unify boot jars with system server jars:
PRODUCT_SYSTEM_SERVER_JARS and PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
do not overlap.

Test: aosp_walleye-userdebug boots

Exempt-From-Owner-Approval: cherry-pick.
Bug: 146363577
Change-Id: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
Merged-In: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
(cherry picked from commit 19ed3a0db7)
2020-02-13 13:36:11 +00:00
Ramy Medhat c3427499ca Modify D8 template to not have inputs under the output directory.
Test: presubmit

Change-Id: I800664acdeffa04ce83a8446bece411f018af2e2
2020-02-13 07:19:53 -05:00
Automerger Merge Worker 94990a3860 Merge "Implement BOARD_VNDK_VERSION" am: b21ca5795e am: d3a28a3676 am: 32773f7e24
Change-Id: I1ce92958abc9711f2919a546cd91330edda212b4
2020-02-13 11:51:51 +00:00
Automerger Merge Worker 32773f7e24 Merge "Implement BOARD_VNDK_VERSION" am: b21ca5795e am: d3a28a3676
Change-Id: I2e88272b67e51ab28cc94da2e558089b905389aa
2020-02-13 11:37:36 +00:00
Automerger Merge Worker d3a28a3676 Merge "Implement BOARD_VNDK_VERSION" am: b21ca5795e
Change-Id: I103d0e3a580ef3a7665502a3dd1dc95612045efc
2020-02-13 11:17:02 +00:00
Treehugger Robot b21ca5795e Merge "Implement BOARD_VNDK_VERSION" 2020-02-13 11:01:10 +00:00
Ulyana Trafimovich 6780e0aaa1 Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." 2020-02-13 10:53:13 +00:00
Automerger Merge Worker 8b50f17e22 Merge "rm libbinderthreadstate" am: 6bf4a7d0be am: a026dfb5dc am: 7a81802e2a
Change-Id: I9bc6b19c7c506158f19049c73cdf34a8a804f6ee
2020-02-12 21:34:24 +00:00
Automerger Merge Worker 7a81802e2a Merge "rm libbinderthreadstate" am: 6bf4a7d0be am: a026dfb5dc
Change-Id: I0b8235dda478fee020a28229f84592948500ab95
2020-02-12 21:20:25 +00:00
Automerger Merge Worker a026dfb5dc Merge "rm libbinderthreadstate" am: 6bf4a7d0be
Change-Id: I403d91e9b1de2c4cad020708f1576a8adccd88fa
2020-02-12 21:12:32 +00:00
Steven Moreland 6bf4a7d0be Merge "rm libbinderthreadstate" 2020-02-12 21:10:48 +00:00
Ulya Trafimovich 19ed3a0db7 Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint.
This is to unify boot jars with system server jars:
PRODUCT_SYSTEM_SERVER_JARS and PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
do not overlap.

Test: walleye-userdebug boots

Bug: 146363577
Change-Id: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
2020-02-12 16:16:55 +00:00
David Zeuthen 361ca8fd81 Port IdentityCredential HAL to AIDL.
Bug: 111446262
Test: atest android.security.identity.cts
Test: VtsHalIdentityTargetTest
Test: android.hardware.identity-support-lib-test
Change-Id: I471569a6db9311171faf7520697cd7f67f80078c
2020-02-12 09:57:41 -05:00
Narayan Kamath af5a0e7b98 Merge "Reland: Rework platform version to hide codenames." 2020-02-12 08:42:17 +00:00
Automerger Merge Worker 017ff9f36d Merge "core/Makefile: pass value of PRODUCT_USE_DYNAMIC_PARTITION_SIZE" am: 77ffb564a9 am: 70248b3392 am: 529e7eadc1
Change-Id: I8c1e680df7584fd78fbecdd7fa8866ed2ebd4de1
2020-02-12 02:12:29 +00:00
Automerger Merge Worker 529e7eadc1 Merge "core/Makefile: pass value of PRODUCT_USE_DYNAMIC_PARTITION_SIZE" am: 77ffb564a9 am: 70248b3392
Change-Id: I6dd2e545758193966668685573522a83422bde92
2020-02-12 01:55:53 +00:00
Automerger Merge Worker 70248b3392 Merge "core/Makefile: pass value of PRODUCT_USE_DYNAMIC_PARTITION_SIZE" am: 77ffb564a9
Change-Id: Idffbd1ee45442fb11bd92f2bc67bd1409aa2ee86
2020-02-12 01:42:46 +00:00
Treehugger Robot 77ffb564a9 Merge "core/Makefile: pass value of PRODUCT_USE_DYNAMIC_PARTITION_SIZE" 2020-02-12 01:26:51 +00:00
Automerger Merge Worker 50a99cbedc Update Security String to 2020-04-05 am: d451ad7167 am: fcfd5b554a
Change-Id: Ic383f938d12f9fac0d93364ba737f0c401fb0a01
2020-02-11 18:02:44 +00:00