Commit graph

41875 commits

Author SHA1 Message Date
Ryan Prichard
b9ecf4da4d Merge "Fix mini_debug_info stripping when no symbols should be kept."
am: a77e2acd6b

Change-Id: Ia3d4fcec1a48f0c573d0c413d4ffc90eb8d3cac1
2018-04-03 21:48:12 -07:00
Treehugger Robot
a77e2acd6b Merge "Fix mini_debug_info stripping when no symbols should be kept." 2018-04-04 04:28:52 +00:00
Vishwath Mohan
87b4df28a5 Merge "Add components to enable CFI for."
am: 3790f8b23f

Change-Id: Ib91a3df7abb5ec8f15706462ce2e4e7b30463174
2018-04-03 00:10:19 +00:00
Treehugger Robot
3790f8b23f Merge "Add components to enable CFI for." 2018-04-02 23:58:44 +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
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
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
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
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
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
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
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
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
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
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
bohu
146354ffd7 Merge "emulator: update fstab.ranchu installation for arm images"
am: ef364228d7

Change-Id: I013c71f7107ad8d07a4bb97c8b0187294914971f
2018-03-29 06:13:50 +00:00
Treehugger Robot
ef364228d7 Merge "emulator: update fstab.ranchu installation for arm images" 2018-03-29 06:04:41 +00:00
Ryan Prichard
a45f5833c0 Fix mini_debug_info stripping when no symbols should be kept.
If there are no symbols to keep (i.e. all function symbols are also in
the dynsym table), then the $@.keep_symbols file has size 0.
When objcopy parses a --keep-symbols file, it has a special case for
0-sized files where it silently fails (exits with status 1, no error
message). On the other hand, objcopy is happy with a file containing no
symbols, as long as there is some whitespace or a comment. Avoid the
special case by appending a newline to keep_symbols.

Bug: b/62815515
Bug: b/77242617
Test: manual
Change-Id: I348593164fe78ece5c85db3d28c7daccce3a52fb
2018-03-29 01:39:07 +00:00
Hridya Valsaraju
9ce04eef0c Merge "Allow addition of recovery DTBO to recovery image"
am: df2a21794c

Change-Id: Ia73adbfda59a43b9bfab329697f7df851bca8d1e
2018-03-29 00:25:41 +00:00
Treehugger Robot
df2a21794c Merge "Allow addition of recovery DTBO to recovery image" 2018-03-29 00:02:57 +00:00
bohu
acc16846e3 emulator: update fstab.ranchu installation for arm images
Now init.ranchu.rc picks up fstab.ranchu from vendor/etc
instead of from /

BUG: 77233572
Change-Id: Ifd8639ac4cb883402c90de45b15b11077a60fa5f
2018-03-28 15:39:28 -07:00
Elliott Hughes
f12e8f81bd Remove unused dalvik.vm.stack-trace-dir.
Bug: http://b/73140330
Test: boots
Change-Id: I6145b7af8224165546b1fbdb95b4d2ac2c1f0997
2018-03-28 14:57:58 -07:00
Alexey Polyudov
9bcd3ee0dd Merge "Do not use UBSAN library on HOST or AUX targets"
am: ce81400244

Change-Id: Id19cf7124c1e4c3915b81f070fdb3de943b062b6
2018-03-28 18:04:57 +00:00
Alexey Polyudov
ce81400244 Merge "Do not use UBSAN library on HOST or AUX targets" 2018-03-28 17:47:50 +00:00
Alexey Polyudov
e98e5625ad Do not use UBSAN library on HOST or AUX targets
AUX modules are not necessarily using the same toolchain
as the TARGET modules. they don't have to depend on
this library.

Change-Id: Ib50cf0eb26c257ae3eb69a43aa1a12c41d5d39b0
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
2018-03-27 17:21:23 -07:00
Tri Vo
d9c8e956ac 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
2018-03-27 17:11:38 -07:00
Tobias Thierer
1bba4bfd24 Merge "javadoc/droidoc: Don't add .jar files to sourcepath."
am: c209fb1799

Change-Id: Icdc8483e2f59bfec979b01b57a9770dc58c81929
2018-03-27 10:07:15 +00:00
Tobias Thierer
c209fb1799 Merge "javadoc/droidoc: Don't add .jar files to sourcepath." 2018-03-27 09:54:13 +00:00
Bowgo Tsai
9bbc647458 Merge "Products launching with API 28 needs system-as-root"
am: 1f7bf445e7

Change-Id: I61d89c55ace0c2373f4c883c167ba5378e960d14
2018-03-27 03:51:29 +00:00
Treehugger Robot
1f7bf445e7 Merge "Products launching with API 28 needs system-as-root" 2018-03-27 03:40:22 +00:00
Jiyong Park
d60f6cbea7 Merge "RRO for framework-res.apk is not force built against SystemSDK"
am: 73b009e96c

Change-Id: I183951990149b2c9e8016676f1f1a795028ece5d
2018-03-27 03:38:56 +00:00
Treehugger Robot
73b009e96c Merge "RRO for framework-res.apk is not force built against SystemSDK" 2018-03-27 03:28:32 +00:00
Justin Yun
c050d6da06 Merge "Set __ANDROID_API__ for vendor binaries to vndk version."
am: dad6450cd3

Change-Id: I564da2eeb8a5a727a1bae61b50d29072daf42c72
2018-03-27 01:31:37 +00:00
Treehugger Robot
dad6450cd3 Merge "Set __ANDROID_API__ for vendor binaries to vndk version." 2018-03-27 01:24:02 +00:00
Jiyong Park
c0ece103ec RRO for framework-res.apk is not force built against SystemSDK
When BOARD_SYSTEMSDK_VERSIONS is set, any apk in the vendor partition
is force built against SystemSDK (or Android SDK if LOCAL_SDK_VERSION is
set to current). However, there should be one exception to this: RRO for
framework-res.apk. This is because the RRO is currently overriding
resources that are not part of SystemSDK. Until SystemSDK is expanded to
cover resources that are eligible for overriding, let's allow the direct
dependency from RRO to framework-res.apk.

Bug: 35859726
Bug: 76398918
Test: m -j
Merged-In: Ib9981b107d78691eef21f4525ebdac9866d5c50e
Change-Id: Ib9981b107d78691eef21f4525ebdac9866d5c50e
(cherry picked from commit d8c4c30ba4)
2018-03-27 09:40:11 +09:00
Tobias Thierer
e5665cdb4e javadoc/droidoc: Don't add .jar files to sourcepath.
javadoc expects directories on the sourcepath, not jar files.
The original commit 88b607994a
in 2009 was already passing the jar files, and every revision
since then seems to have kept this habit through cargo cult.

This CL removes the superfluous jar file arguments from the
sourcepath argument to javadoc.

Test: Treehugger
Bug: 76436487

Change-Id: I44b4b8ba248ad4deafbb6462e6f7398f15bd2845
2018-03-27 00:33:18 +01:00
Justin Yun
65c680e285 Set __ANDROID_API__ for vendor binaries to vndk version.
When building vendor modules with BOARD_VNDK_VERSION=current, the
API of the vendor modules will be current PLATFORM_VNDK_VERSION.
__ANDROID_API_FUTURE__ will be used as before if the version is a
CODENAME.

If BOARD_VNDK_VERSION is not "current", that means the VNDK version
of the vendor modules is BOARD_VNDK_VERSION.

Bug: 74833244
Test: Build and check boot.
Change-Id: Iccc603f1b5ffa066e74ba1357f3fbbcc13c58f76
2018-03-27 08:22:11 +09:00
Hridya Valsaraju
e74a38bc6d 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.
Also tested that aosp_angler-userdebug could
boot into recovery(including a fake dtbo.img
in recovery image).

Bug: 74763691

Change-Id: I38c9c395c95d21f4da42cfa646063bd4416f6bd8
2018-03-26 22:54:55 +00:00
Bowgo Tsai
ed3b1ca12c Products launching with API 28 needs system-as-root
With project Treble, it's possible to only update system.img across
Android major releases without changing other partitions. However,
for non-A/B devices, ramdisk cannot be updated via a system-only OTA
because it resides in /boot partition.

This leads to two major incompatibility issues:
  - The older /init in ramdisk might not be able to parse the *.rc files
    on /system.
  - The ramdisk contains /init.rc, which also may be out of date compared to
    what is required for the new /system.

Therefore, for new devices launched in P with full Treble support, ramdisk
should be merged into system.img by setting
BOARD_BUILD_SYSTEM_ROOT_IMAGE := True.

Upgrading devices can keep using non-system-as-root configuration.

Bug: 64194858
Test: manual makefile prodding
Change-Id: Ic04c63bd2aac3afa686a6f5cb124beebbcd6a5ee
2018-03-26 23:16:06 +08:00