Commit graph

44791 commits

Author SHA1 Message Date
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
Colin Cross
164a33f194 Fix zipped resources
Fix mismatch between output directory of zipsync and input
directory of aapt2.

Test: m checkbuild
Change-Id: If012c943af0c04cc3f0dd5c4266126412ae0a759
2018-05-09 23:56:19 +00: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
Tao Bao
faa8e0b7e9 releasetools: Use "ota-downgrade=yes" for --override_timestamp.
We used to write a fake post-timestamp into package metadata for
"--override_timestamp", which allows a package to be pushed based on
the fake timestamp. This CL stops doing that by using the designated
"ota-downgrade=yes" instead, but keeping the "--override_timestamp" flag
for backward compatibility.

Now both "--override_timestamp" and "--downgrade" allow pushing packages
with downgrade timestamps. The only differenece is that "--downgrade"
enforces a data wiping, because it's intended a real downgrade (based on
Android version or security patch level). "--override_timestamp" serves
the path of a legit "upgrade", but unfortunately with build timestamps
in reverse order (e.g. the two builds are cut from different branches).

With this CL, we write "post-timestamp" to all packages.

Bug: 77811049
Test: Generate an incremental pakcage with "--override_timestamp".
Test: Generate an incremental pakcage with "--downgrade".
Test: python -m unittest test_ota_from_target_files
Change-Id: I4ae4ce77cb600a06ffd9b15b6d4c730314aa0b79
2018-05-09 10:23:14 -07: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
Nelson Li
479da2f3bb Build System: Validate AndroidTest.xml Configs
make <test> should fail if the test has a poorly configured
atest configuration

BUG: 73082610
Test: cd packages/apps/Bluetooth/tests/unit; mma
      Modify AndroidTest.xml to a not well-formed xml; mma
      Then, it should build fail.
      atest -v BluetoothInstrumentationTests

Change-Id: I774b4eb81a1b9e9ae31de949aea995d2f258e9a1
2018-05-08 00:26:40 +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
Jiyong Park
ba9c287e52 [automerger skipped] Remove some VNDK libraries that were incorrectly added
am: aa43c4b7d3  -s ours

Change-Id: Ia8f1cf94a34ef7069e29d6546dd18c043c183355
2018-05-07 14:29:25 -07:00
android-build-team Robot
00e17fa8b4 Merge changes from topic "remove_bufferhub_from_vndk" into pi-dev
* changes:
  Remove some VNDK libraries that were incorrectly added
  Remove some VNDK libraries that were incorrectly added
2018-05-07 21:20:13 +00:00
Chih-hung Hsieh
3df942176b Merge "Set global default to use lld."
am: 1defe63536

Change-Id: Ia50e61c09efee5b4576221c8bec7f4a9efaba07c
2018-05-07 13:56:12 -07:00
android-build-team Robot
1ccf2c3563 Merge "Add vr_hwc to GSI" into pi-dev
am: d819512eee

Change-Id: Iff5f9850c31ed03172452713eaea12eea2d56b8c
2018-05-07 13:44:16 -07:00
android-build-team Robot
d819512eee Merge "Add vr_hwc to GSI" into pi-dev 2018-05-07 20:34:05 +00:00
Colin Cross
f0e93a6cfc [automerger skipped] Merge changes from topic "soong_support_libs" am: 9871635469
am: c692e6e9f3  -s ours

Change-Id: I39d1118cc11aadb8c53daaef9a046847f968791f
2018-05-07 13:18:42 -07:00
Chih-hung Hsieh
1defe63536 Merge "Set global default to use lld." 2018-05-07 19:44:53 +00:00
Colin Cross
c692e6e9f3 Merge changes from topic "soong_support_libs"
am: 9871635469

Change-Id: Id57650ed5b856a6887043ebc4cae264d12720127
2018-05-07 12:09:23 -07:00
Mathieu Chartier
399a6d8673 Specify dirty image objects for profile boot image
This wasn't being specified previously while it should have been.

Test: make
Change-Id: I671e93d4502b1f47cff31de19f2ea558dde6253b
2018-05-07 11:50:00 -07:00
Colin Cross
9871635469 Merge changes from topic "soong_support_libs"
* changes:
  Fix support libraries dependencies based on Soong modules
  Always statically include Support Libraries, move SDK definitions up a dir
  Move Support Library dependencies to their own var with resolution
  Allow projects to define their own globally-available variables
2018-05-07 17:53:09 +00:00
Mathieu Chartier
90d229d096 Specify speed compiler filter for image
am: c0890b9386

Change-Id: I7f0caf153d7cac897a282441420cb73e9daa3035
2018-05-07 10:17:30 -07:00
Chih-Hung Hsieh
962424149d Set global default to use lld.
* Use clang lld by default, unless LOCAL_USE_CLANG_LLD
  or USE_CLANG_LLD is set to false or 0.

Bug: 73768157
Test: make checkbuild and boot
Change-Id: I9b28550a0626c96f6e025b0f20705a2e4a5049d7
2018-05-07 09:27:49 -07:00
yangbill
59c616a263 Build System: Fix rpath error if native executable under testcase folder.
error while loading shared libraries: libc++.so:
cannot open shared object file: No such file or directory

BUG: N/A
Test: make -j16 liblatinime_host_unittests
      out/host/linux-x86/testcases/liblatinime_host_unittests/x86_64/liblatinime_host_unittests

Change-Id: I97738f728c29ab904fc979ff9b08a8d5bd1328cd
2018-05-07 06:29:12 +00:00
SzuWei Lin
ece9324bed Add vr_hwc to GSI
Bug: 78308559
Test: Check the /system/etc/init/vr_hwc.rc and /system/bin/vr_hwc
      are built into system.img

Change-Id: I84ac8149d1bccaff0451f4a4ae679853d6625976
2018-05-07 13:44:30 +08:00
android-build-prod (mdb)
78c516077c Merge "Add iotop to PRODUCT_PACKAGES_DEBUG" am: ab235a9fb8
am: 954d6b2075

Change-Id: I5a478d2d9e37bb60e76394ed7be8317da009049c
2018-05-05 14:44:21 -07:00