Commit Graph

44502 Commits

Author SHA1 Message Date
Mathieu Chartier
00b42e8c6e Merge "Add support for preopt with uses-libraries" into pi-dev
am: 110d18d73c

Change-Id: Ia861e8d9bb2570ccb10c101e81e83eb372ef41f7
2018-05-10 11:47:48 -07:00
Mathieu Chartier
110d18d73c Merge "Add support for preopt with uses-libraries" into pi-dev 2018-05-10 18:37:12 +00:00
Jackal Guo
f03ebd862b [automerger skipped] Merge "Allow PRODUCT_COPY_FILES to copy raw APKs into system_other" into pi-dev
am: 732ed64fbd  -s ours

Change-Id: I315de77274cdf14603651522c24ada4d551b1670
2018-05-09 20:22:39 -07:00
Dan Willemsen
ab3974163b [automerger skipped] Allow PRODUCT_COPY_FILES to copy raw APKs into system_other
am: 68e1289626  -s ours

Change-Id: I8ea922e439c5dd9d6f506477616ad7c405e383c4
2018-05-09 20:18:26 -07:00
Jackal Guo
732ed64fbd Merge "Allow PRODUCT_COPY_FILES to copy raw APKs into system_other" into pi-dev 2018-05-10 03:14:12 +00:00
Dan Willemsen
4541382d82 Merge "Add micro_bench to PRODUCT_PACKAGES_DEBUG" am: 63097b276b
am: 0eeb4e2f4b

Change-Id: Idaf94b2bdc340ec0bfa013c3b7d418cf766e6555
2018-05-09 19:46:33 -07:00
Dan Willemsen
0eeb4e2f4b Merge "Add micro_bench to PRODUCT_PACKAGES_DEBUG"
am: 63097b276b

Change-Id: I8a159fb084af38ca4adea68a10e37efe2a3df358
2018-05-09 19:41:58 -07:00
Treehugger Robot
63097b276b Merge "Add micro_bench to PRODUCT_PACKAGES_DEBUG" 2018-05-10 02:30:00 +00:00
Isaac Chen
d332396af8 Merge "Remove redundant entries from treble_common.mk" into pi-dev
am: 0502416b95

Change-Id: I0e12991e632207c063586d30f1ab7fa7063208e8
2018-05-09 19:03:17 -07:00
Isaac Chen
0502416b95 Merge "Remove redundant entries from treble_common.mk" into pi-dev 2018-05-10 01:56:19 +00:00
Colin Cross
6a58478638 [automerger skipped] Merge "Pass PLATFORM_VERSION to Soong" am: 8f5535fd93
am: cd1d24c5e4  -s ours

Change-Id: Id59d6d2db0d17bbabd22bf65a9d4ba3fc02e4af3
2018-05-09 18:04:11 -07:00
Colin Cross
cd1d24c5e4 Merge "Pass PLATFORM_VERSION to Soong"
am: 8f5535fd93

Change-Id: I3228ba124f2e187ecc7095e84fc8566869642865
2018-05-09 18:00:36 -07:00
yangbill
4e90814306 Merge "Build System: Fix rpath error if native executable under testcase folder." am: 5c3646c201
am: 26f5fb8d60

Change-Id: I6a167a932833b60da5ade47511f2d239c591315e
2018-05-09 17:56:28 -07:00
Treehugger Robot
8f5535fd93 Merge "Pass PLATFORM_VERSION to Soong" 2018-05-10 00:54:13 +00:00
yangbill
26f5fb8d60 Merge "Build System: Fix rpath error if native executable under testcase folder."
am: 5c3646c201

Change-Id: Ib08bd29b620c934288b587df8863656752815a4d
2018-05-09 17:52:21 -07:00
Treehugger Robot
5c3646c201 Merge "Build System: Fix rpath error if native executable under testcase folder." 2018-05-10 00:40:27 +00:00
Dan Willemsen
a362bf4e20 Add micro_bench to PRODUCT_PACKAGES_DEBUG
It's been converted to Soong, so can no longer use LOCAL_MODULE_TAGS. It
appears that some of the test runners expect to have it pre-installed.

Test: m; see it installed.
Change-Id: I189c9bbc2f2add90ac4f6841f4bf13852e4d579f
2018-05-09 17:33:12 -07:00
Elliott Hughes
f29014c082 Merge "Revert "Revert "Revert "Set global default to use lld."""" am: 0f8056b254
am: f25dd76703

Change-Id: I8da835d8b13d4e5ec9f93c6b253dbfa997334f12
2018-05-09 17:05:39 -07:00
Elliott Hughes
f25dd76703 Merge "Revert "Revert "Revert "Set global default to use lld.""""
am: 0f8056b254

Change-Id: I06430a4b82ca389752086e17504146ccd6204c30
2018-05-09 17:01:11 -07:00
Mathieu Chartier
09f3b97f4b Add support for preopt with uses-libraries
Required libraries are specified with LOCAL_USES_LIBRARIES
Optional libraries are specified with LOCAL_OPTIONAL_USES_LIBRARIES

The make rule cross references the libraries against what's stored
in the manifest.

Verification is enabled if LOCAL_ENFORCE_USES_LIBRARIES is true. This
defaults to true if either of LOCAL_USES_LIBRARIES or
LOCAL_OPTIONAL_USES_LIBRARIES are specified.

Bug: 70934104
Bug: 67345922
Test: manual

Change-Id: Ifca7d1a993620e9d0e42dc497a4a5d7a6c3f4172
2018-05-09 16:52:10 -07:00
Elliott Hughes
0f8056b254 Merge "Revert "Revert "Revert "Set global default to use lld."""" 2018-05-09 23:46:16 +00:00
Colin Cross
0fdbb4c910 Pass PLATFORM_VERSION to Soong
Soong needs PLATFORM_VERSION to pass as --version-name when building
framework-res.apk.

Bug: 78324052
Test: aapt dump badging $OUT/system/framework/framework-res.apk  | grep -i version
Change-Id: If47839182a1dd7c7a768b1253dd8b575d777ca7e
Merged-In: If47839182a1dd7c7a768b1253dd8b575d777ca7e
(cherry picked from commit 34aba6cf72)
2018-05-09 23:44:18 +00:00
Colin Cross
39599c9ddf Merge "Pass PLATFORM_VERSION to Soong" into pi-dev
am: 96ec5a58ae

Change-Id: I2824263efd0abeed92b8381fe43607b938edd5ce
2018-05-09 14:40:23 -07:00
TreeHugger Robot
96ec5a58ae Merge "Pass PLATFORM_VERSION to Soong" into pi-dev 2018-05-09 21:32:08 +00:00
Elliott Hughes
876a36e8ac Revert "Revert "Revert "Set global default to use lld."""
This reverts commit da8febf39c.

Bug: http://b/73768157
Reason for revert: breaks several bionic/debuggerd/libunwind_stack gtests

Change-Id: I161cf85cf352b80644524fd4bb70ff7c75fbc1d0
2018-05-09 20:33:25 +00:00
Calin Juravle
5b92db48ef Merge "Remove unnecessary dalvik.vm.extra-opts from profile_boot_common" into pi-dev
am: d9a863b534

Change-Id: I3c9a85edc4a8512a9285f552e9ebf09bed465585
2018-05-09 12:12:53 -07:00
Colin Cross
34aba6cf72 Pass PLATFORM_VERSION to Soong
Soong needs PLATFORM_VERSION to pass as --version-name when building
framework-res.apk.

Bug: 78324052
Test: aapt dump badging $OUT/system/framework/framework-res.apk  | grep -i version
Change-Id: If47839182a1dd7c7a768b1253dd8b575d777ca7e
2018-05-09 11:10:15 -07:00
Calin Juravle
d9a863b534 Merge "Remove unnecessary dalvik.vm.extra-opts from profile_boot_common" into pi-dev 2018-05-09 18:04:24 +00:00
Calin Juravle
7478781f58 Remove unnecessary dalvik.vm.extra-opts from profile_boot_common
The flag is already passed if dalvik.vm.profilebootimage=true.

Test: m
Bug: 73313191
Change-Id: I7bfe91f295548e6aa9d6a783623e6344221136fb
2018-05-09 17:45:22 +00:00
Isaac Chen
64dec58cc2 Merge "Build disabled vbmeta.img for aosp_$arch" into pi-dev
am: 0d35d1a425

Change-Id: I9d0865299c34dd6997d08bb1a297ca6acda9ef8b
2018-05-09 00:00:47 -07:00
Isaac Chen
0d35d1a425 Merge "Build disabled vbmeta.img for aosp_$arch" into pi-dev 2018-05-09 06:53:03 +00:00
Dan Willemsen
68e1289626 Allow PRODUCT_COPY_FILES to copy raw APKs into system_other
Files in this partition aren't actually installed, so we don't need to
use the BUILD_PREBUILT logic for APKs.

Bug: 66960479
Test: try PRODUCT_COPY_FILES of an apk into system, errors
Test: try PRODUCT_COPY_FILES of an apk into system_other, accepted
Change-Id: Ie721d2b884c6badfbe0e46f55c265b770bed618b
Merged-In: Ie721d2b884c6badfbe0e46f55c265b770bed618b
(cherry picked from commit 7d957c911a)
2018-05-09 06:38:28 +00:00
Tri Vo
dab6055646 Merge "Expose selinux variables to Soong." am: d744f8cc8e
am: 570ea0cc8a

Change-Id: Id9d04262afcd7f48c1e1ba248a703d7fd2c48bff
2018-05-08 19:15:26 -07:00
Tri Vo
570ea0cc8a Merge "Expose selinux variables to Soong."
am: d744f8cc8e

Change-Id: Ib3b15644939173dea8f32660f652c6ac32171872
2018-05-08 19:09:10 -07:00
Tri Vo
d744f8cc8e Merge "Expose selinux variables to Soong." 2018-05-09 01:57:14 +00:00
Chih-hung Hsieh
02bbb59dc8 Merge "Revert "Revert "Set global default to use lld.""" am: 44f320c29e
am: 3b0208b7ba

Change-Id: I33e9cd9621c1a471ebb58e383c4098fca2f80272
2018-05-08 16:13:02 -07:00
Chih-hung Hsieh
3b0208b7ba Merge "Revert "Revert "Set global default to use lld."""
am: 44f320c29e

Change-Id: I344e2d45ac36d58593154d143c8a2eca3ba425d5
2018-05-08 16:08:21 -07:00
Chih-hung Hsieh
44f320c29e Merge "Revert "Revert "Set global default to use lld.""" 2018-05-08 22:57:01 +00:00
Chih-hung Hsieh
da8febf39c Revert "Revert "Set global default to use lld.""
This reverts commit 44988be862.

Three known build failures with lld are fixed by
(1) adding --no-fatal-warnings to link
(2) disable LLD for some PGO build targets
(3) disable LLD for some art oatdump tests, pending c/681542

Change-Id: Icebf6661509bf4f6051f91dc74eaa07dbc7c1d42
2018-05-08 20:13:41 +00:00
android-build-prod (mdb)
5fe128653f Merge "Revert "Set global default to use lld."" am: ec87c9f56e
am: 27976638b5

Change-Id: I847bccebac49cb293fb5fe05d63315528ff95606
2018-05-08 08:54:56 -07:00
android-build-prod (mdb)
27976638b5 Merge "Revert "Set global default to use lld.""
am: ec87c9f56e

Change-Id: I6b4691b119c27d34b818949df87c3ce864c457ab
2018-05-08 08:48:51 -07:00
android-build-prod (mdb)
ec87c9f56e Merge "Revert "Set global default to use lld."" 2018-05-08 15:33:44 +00:00
Nicolas Geoffray
44988be862 Revert "Set global default to use lld."
Bug: 73768157

Some errors with HOST_PREFER_32_BIT:
HOST_PREFER_32_BIT=true m -j32 test-art-host-gtest

This reverts commit 962424149d.

Change-Id: I788ec3e39d6989d583d3c7d4706299fe5a7841f2
2018-05-08 12:37:34 +00:00
Isaac Chen
e63c937bc3 Build disabled vbmeta.img for aosp_$arch
System images of aosp_$arch are used as GSIs in P, and traditional GSI
users often need a special vbmeta image to disable verity (if AVB is
employed) befrre they flash the GSI.

"BOARD_BUILD_DISABLED_VBMETAIMAGE := true" builds such vbmeta.img

Bug: 79393905
Test: # For arch in arm, arm64, x86, x86_64, do
    $ lunch aosp_$arch; m -j # found vbmeta.img under $OUT

Change-Id: I113006385991a2daab60d3c55dc03f23f1b383b8
2018-05-08 18:10:06 +08:00
Isaac Chen
e6ba13f561 Remove redundant entries from treble_common.mk
Following entries in treble_common.mk are redundant:
 - vndk_package		# main.mk
 - libvulkan		# base.mk
 - audio.a2dp.default	# full_base.mk
 - netutils-wrapper-1.0	# full_base.mk

Bug: 78253534
Test: built and the components above are still included.
Change-Id: Iab75b46cba2fa64dd62a10ac6879da09349ad8bc
2018-05-08 11:09:28 +08:00
Mathieu Chartier
c6029da0e2 Merge "Specify dirty image objects for profile boot image" am: 85f2ffd5ee
am: 75eb79ca90

Change-Id: Ibade8422e3450091b1fe9c4fbb8abb83d9305d8b
2018-05-07 18:33:30 -07:00
Mathieu Chartier
75eb79ca90 Merge "Specify dirty image objects for profile boot image"
am: 85f2ffd5ee

Change-Id: Ie9f5c9aced07d92a1ee8039706635d51a210e7c3
2018-05-07 18:27:25 -07:00
Mathieu Chartier
85f2ffd5ee Merge "Specify dirty image objects for profile boot image" 2018-05-08 01:19:59 +00:00
Chih-hung Hsieh
c9a39c7beb Merge "Set global default to use lld." am: 1defe63536
am: 3df942176b

Change-Id: I212cd5e5843aadbfdcc04cc87f76a4bfe29f5bb0
2018-05-07 15:50:29 -07:00
android-build-team Robot
3b6ab836e3 Merge changes from topic "remove_bufferhub_from_vndk" into pi-dev
am: 00e17fa8b4

Change-Id: I4dcbb5194789a358dea2f5d5b64b722c6cfd10a3
2018-05-07 14:30:01 -07:00