Commit Graph

44169 Commits

Author SHA1 Message Date
Treehugger Robot 3790f8b23f Merge "Add components to enable CFI for." 2018-04-02 23:58:44 +00:00
Tao Bao 69efed29de Merge "Fix the comment for find-test-data-in-subdirs." am: fe3983963f
am: b6d7d34a13

Change-Id: If68f3c4a2bffdf48512453f4d554af9f8f1f5f2c
2018-04-02 23:44:51 +00:00
Tao Bao b6d7d34a13 Merge "Fix the comment for find-test-data-in-subdirs."
am: fe3983963f

Change-Id: I524480ebec897dec5018ff563b46487bf7f3402e
2018-04-02 23:40:50 +00:00
Treehugger Robot fe3983963f Merge "Fix the comment for find-test-data-in-subdirs." 2018-04-02 23:14:11 +00:00
Ivan Lozano 0394579e19 Merge "Enable integer_overflow flag for static targets." am: a61f0042d1
am: ed8a4055fc

Change-Id: Ia6e5340866e0b0b7468cb116f2edeaabb4a06d58
2018-04-02 22:56:43 +00:00
Ivan Lozano ed8a4055fc Merge "Enable integer_overflow flag for static targets."
am: a61f0042d1

Change-Id: Iae706bde9b65ea4da7e0e12e4d6c563cccebb676
2018-04-02 22:51:04 +00:00
Treehugger Robot a61f0042d1 Merge "Enable integer_overflow flag for static targets." 2018-04-02 22:36:42 +00:00
Vishwath Mohan e003a0a6ce Add components to enable CFI for.
This CL adds a list of components to enable CFI for on Arm64 product
configs.

This list is not directly used anywhere, but product configs can
inherit this to easily enable CFI for all tested components.

Bug: 63926619
Test: Inherit the product config; m -j60; verify that CFI is enabled
Change-Id: I56b6dfd5495639974a19623bc7aea9efeb9acff6
2018-04-02 14:35:31 -07:00
Zach Riggle 9358db72c6 Merge "Add PRODUCT_PACKAGES_DEBUG_ASAN" am: c22e207c50
am: ac6cd7414d

Change-Id: I6ac2c7bf82d305f49a3c8962c0bf8107c1d86373
2018-04-02 21:29:21 +00:00
Zach Riggle ac6cd7414d Merge "Add PRODUCT_PACKAGES_DEBUG_ASAN"
am: c22e207c50

Change-Id: I319a93af819a896f697e3ef6d0260f3389a24b39
2018-04-02 21:24:13 +00:00
Treehugger Robot c22e207c50 Merge "Add PRODUCT_PACKAGES_DEBUG_ASAN" 2018-04-02 21:15:59 +00:00
Tri Vo 614e2411b3 Add TOT_SEPOLICY_VERSION = 10000.0
This variable is equal to the sepolicy version for tip-of-tree development.

Bug: 74622750
Test: ./build/soong/soong_ui.bash  --dumpvars-mode -vars PLATFORM_SEPOLICY_VERSION
is unchanged.
Change-Id: I2a62f7399fe245ec0c681e9a789da6b1b83dd9d8
Merged-In: I2a62f7399fe245ec0c681e9a789da6b1b83dd9d8
(cherry picked from commit d9c8e956ac)
2018-04-02 13:44:27 -07:00
Tao Bao 160bb70c4c Fix the comment for find-test-data-in-subdirs.
The function along with LOCAL_TEST_DATA are very helpful, but it took me
some extra minutes to figure out the issue with the arguments.

Test: N/A
Change-Id: I2c2878fca99ab77ea881d86635c27c34f9ecf855
2018-03-30 20:06:36 -07:00
Calin Juravle 858508b2ee Merge "Revert "Change the default compiler filter for install to speed-profile"" into pi-dev
am: c6063bf93c

Change-Id: Idf37f4fec35431c9cdbdaae562885def489f19e2
2018-03-31 02:03:28 +00:00
Jiyong Park 6607492308 [automerger skipped] Merge "Allow platform modules to link to vendor public libraries" into pi-dev
am: 3e1786112f  -s ours

Change-Id: Ida0678706332a85802aba61c2898703c6f867b3f
2018-03-31 01:22:59 +00:00
Calin Juravle c6063bf93c Merge "Revert "Change the default compiler filter for install to speed-profile"" into pi-dev 2018-03-31 00:28:40 +00:00
TreeHugger Robot 3e1786112f Merge "Allow platform modules to link to vendor public libraries" into pi-dev 2018-03-31 00:24:16 +00:00
Calin Juravle 4fcf794170 Revert "Change the default compiler filter for install to speed-profile"
This reverts commit 0edf9aebea.

Reason for revert: it breaks JVMTI CTS tests (because of app images).

Bug: 77340429
Bug: 77321621
Change-Id: I4236ecd42c92f9a594f94cf212f0a75945989ad9
2018-03-31 00:14:04 +00:00
Jeff Gaston e7479b7c5d Merge "Run jetifier against prebuilts directly rather than classes.jar" into pi-dev
am: 51eff801ad

Change-Id: I8d2f4aa6739a908a0591384121686976cb6516c8
2018-03-30 22:02:10 +00:00
SzuWei Lin 368b0c0c5a Remove adding /odm from GSI makefile
am: d24396d4df

Change-Id: I9f01384203a83e5635bc4d06c6cc225706a4e6e5
2018-03-30 21:15:14 +00:00
Zach Riggle 9323b7faf3 Add PRODUCT_PACKAGES_DEBUG_ASAN
This is a list of modules which should be installed by default, but only on
builds which are set up for Address Sanitizer (via SANITIZE_TARGET=address).

Additionally, add sanitizer-status to PRODUCT_PACKAGES_DEBUG so that all
userdebug builds will have the binary.  Currently, the module has the
"debug" tag but it may go away in the future.

Change-Id: I0bea4faf9c2a65380292471437e51ef8324b5af3
2018-03-30 21:09:50 +00:00
Bowgo Tsai db33e9fc25 [automerger skipped] Merge "Products launching with API 28 needs system-as-root" into pi-dev
am: d2ae46e6dc  -s ours

Change-Id: Id19d19308e53e3d182b069fd306fcffe0116a69e
2018-03-30 21:09:47 +00:00
Hridya Valsaraju 5f25c0ea32 [automerger skipped] Merge "Allow addition of recovery DTBO to recovery image" into pi-dev
am: 6ee73ee8c0  -s ours

Change-Id: I327bbf853b1f79158667469d571bdd8e6743c949
2018-03-30 20:20:22 +00:00
TreeHugger Robot 51eff801ad Merge "Run jetifier against prebuilts directly rather than classes.jar" into pi-dev 2018-03-30 19:11:21 +00:00
Tri Vo 46ead88e00 Merge "Add TOT_SEPOLICY_VERSION = 10000.0" am: 802eecc01c
am: 69898d4d14

Change-Id: I77179cee85704e65d5611ebd1668d198ba8b2249
2018-03-30 17:30:54 +00:00
Tri Vo 69898d4d14 Merge "Add TOT_SEPOLICY_VERSION = 10000.0"
am: 802eecc01c

Change-Id: Id6dfee953fa18924e945bceec4261d5db5d3f686
2018-03-30 17:25:39 +00:00
Treehugger Robot 802eecc01c Merge "Add TOT_SEPOLICY_VERSION = 10000.0" 2018-03-30 17:11:36 +00:00
SzuWei Lin d24396d4df Remove adding /odm from GSI makefile
The odm/ is default created under the root directory.
We don't need adding /odm mount pointer now in GSI.

Bug: 77297861
Test: build aosp_arm64_ab-userdebug and boot on a Pixel 2 device.
Change-Id: Ied48439f366acc33595b958b75c2f30d8f6ad57e
2018-03-30 13:39:49 +08:00
Jiyong Park 379ae9274e Allow platform modules to link to vendor public libraries
Normally, when building with VNDK, platform modules are not allowed to
link against vendor libraries, because the ABI of the vendor libraries
are not guaranteed to be stable and may differ across multiple vendor
images.

However, the vendor public libraries are the exceptions. Vendor public
libraries are vendor libraries that are exposed to 3rd party apps and
listed in /vendor/etc/public.libraries.txt. Since they are intended to
be exposed to public, their ABI stability is guaranteed (by definition,
though it is up to the vendor to actually guarantee it).

This change allows platform modules to link to vendor public libraries.
When the name of a vendor public libraries (whose stub is defined via
vendor_public_library in Android.bp) is listed in
LOCAL_SHARED_LIBRARIES, it is actually linked to the stub library which
is available to platform modules.

Bug: 74275385
Test: m -j
Merged-In: I063b43431196190b59332b1bcad59f267073f89f
Change-Id: I063b43431196190b59332b1bcad59f267073f89f
(cherry picked from commit c3f1356a3a)
2018-03-30 12:59:34 +09:00
Jiyong Park a67b3f50a6 Merge "Allow platform modules to link to vendor public libraries" am: fb6389d720
am: 2dc643eb36

Change-Id: I556ef8c1f3da1580021327d6246112d8a1e51660
2018-03-30 03:55:33 +00:00
Jiyong Park 2dc643eb36 Merge "Allow platform modules to link to vendor public libraries"
am: fb6389d720

Change-Id: Ie5975db3dbd7c290bd1be0603375f0cde34e7a96
2018-03-30 03:50:54 +00:00
Treehugger Robot fb6389d720 Merge "Allow platform modules to link to vendor public libraries" 2018-03-30 03:41:22 +00:00
Vishwath Mohan 6042b71185 Merge "Revert "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)"" am: f39badf5f8
am: 4ff11f3f44

Change-Id: Ica2b96e5c735ff76a14f7d82622ab99a2df6a233
2018-03-30 03:13:06 +00:00
Vishwath Mohan 4ff11f3f44 Merge "Revert "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)""
am: f39badf5f8

Change-Id: Ifecb4a0695f93a3f86e3c06b92ef39c8170c1ed7
2018-03-30 03:08:33 +00:00
Vishwath Mohan f39badf5f8 Merge "Revert "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)"" 2018-03-30 02:58:32 +00:00
Vishwath Mohan 21204e4921 Revert "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)"
This reverts commit f03a265786.

Change-Id: I3ca0e2f9e3938b49919a8530b393ba3dba4f118c
2018-03-30 02:55:05 +00:00
TreeHugger Robot d2ae46e6dc Merge "Products launching with API 28 needs system-as-root" into pi-dev 2018-03-30 01:27:27 +00:00
Jiyong Park c3f1356a3a Allow platform modules to link to vendor public libraries
Normally, when building with VNDK, platform modules are not allowed to
link against vendor libraries, because the ABI of the vendor libraries
are not guaranteed to be stable and may differ across multiple vendor
images.

However, the vendor public libraries are the exceptions. Vendor public
libraries are vendor libraries that are exposed to 3rd party apps and
listed in /vendor/etc/public.libraries.txt. Since they are intended to
be exposed to public, their ABI stability is guaranteed (by definition,
though it is up to the vendor to actually guarantee it).

This change allows platform modules to link to vendor public libraries.
When the name of a vendor public libraries (whose stub is defined via
vendor_public_library in Android.bp) is listed in
LOCAL_SHARED_LIBRARIES, it is actually linked to the stub library which
is available to platform modules.

Bug: 74275385
Test: m -j
Change-Id: I063b43431196190b59332b1bcad59f267073f89f
2018-03-30 10:12:30 +09:00
TreeHugger Robot 6ee73ee8c0 Merge "Allow addition of recovery DTBO to recovery image" into pi-dev 2018-03-29 23:51:09 +00:00
Calin Juravle 91fc5b6c2a Merge "Change the default compiler filter for install to speed-profile" into pi-dev
am: 0abfbdaa00

Change-Id: I039553f99584aee5013c6ed1e7b509a2e6686851
2018-03-29 23:43:07 +00:00
Vishwath Mohan 041958302a Merge "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)" am: a143397aee
am: 339c1d8aa5

Change-Id: I84fd82ac8b00b8648c08840bbb26febb2a41a821
2018-03-29 23:11:58 +00:00
Vishwath Mohan 339c1d8aa5 Merge "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)"
am: a143397aee

Change-Id: I2d6a6fd8006f9afa163f6cf20f74a67157583548
2018-03-29 23:06:52 +00:00
Treehugger Robot a143397aee Merge "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)" 2018-03-29 22:55:35 +00:00
Elliott Hughes 0f0068eddc Merge "Remove unused dalvik.vm.stack-trace-dir." am: e67bbf39fc
am: 5aea4cf3f8

Change-Id: Ic3eb15c8389d37b2b7047207df495932ade5a5e4
2018-03-29 22:05:17 +00:00
Calin Juravle 0abfbdaa00 Merge "Change the default compiler filter for install to speed-profile" into pi-dev 2018-03-29 21:57:57 +00:00
Elliott Hughes 5aea4cf3f8 Merge "Remove unused dalvik.vm.stack-trace-dir."
am: e67bbf39fc

Change-Id: Ie6f8d9e5f1b529f42b0d6a359edf5fea7e209ec9
2018-03-29 21:50:28 +00:00
Elliott Hughes e67bbf39fc Merge "Remove unused dalvik.vm.stack-trace-dir." 2018-03-29 21:15:16 +00:00
Vishwath Mohan f03a265786 Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)
This CL changes PRODUCT_CFI_INCLUDE_PATHS to be included in all
product configs by default. To maintain the status quo, the sanitizer
logic has been modified to only respect this product config for Arm64
devices (where this was previously enabled).

Bug: 63926619
Test: m -j60 # the device still has CFI enabled thanks to the default
opt-in

Change-Id: I22788d92be881d3290568488f5458c85e02ee8c7
2018-03-29 13:07:10 -07:00
Hridya Valsaraju d67d8609bb Allow addition of recovery DTBO to recovery image
Non-A/B devices need to include the DTBO image
within the recovery partition to be self-sufficient
and prevent OTA failures.

Test: Ran 'm dist' and verified that the DTBO image
was included in recovery.img using unpack_bootimg.
Also ran 'make' and verified that the DTBO image was
included in recovery.img using unpack_bootimg.

Bug: 74763691

Change-Id: I38c9c395c95d21f4da42cfa646063bd4416f6bd8
Merged-In: I38c9c395c95d21f4da42cfa646063bd4416f6bd8
(cherry picked from commit e74a38bc6d)
2018-03-29 17:51:57 +00:00
Justin Yun a814eb5625 [automerger skipped] Merge "Use default libnfc-nci.conf if not found in vendor/etc" into pi-dev
am: 1ba5f6745a  -s ours

Change-Id: Ibbdbf560909f5624e559f26ccd988aa91d933b93
2018-03-29 07:19:46 +00:00