Commit Graph

4888 Commits

Author SHA1 Message Date
Riddle Hsu
ba31b8073f Merge "Disable the prebuilt host binary test on darwin." am: 280b899a37 am: a33f2016a2 am: da56a9b9d8 am: 175d2623e8 am: c23b5e91d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1427730

Change-Id: I42bd16c08f6cf049d12f80831702daf80d51ad10
2020-09-15 10:19:00 +00:00
Treehugger Robot
67a2b72204 Merge "Symlink prebuilt binaries on host." am: b11236d53d am: cb067953eb am: f34d8c94d7 am: 089e8d67d2 am: 7a4913c245
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1404637

Change-Id: Ic00a88ed42e702adfea522b9319db95d6afd5cfc
2020-09-15 02:54:08 +00:00
Martin Stjernholm
6a9a14663d Disable the prebuilt host binary test on darwin.
Variants and paths are different there, and it is hard to test since
it's only in postsubmit in TH.

Test: m nothing
Bug: 168558897
Change-Id: I071540b3c7ff9a9fd4104dca75079e831b1b2529
2020-09-15 02:56:19 +01:00
Treehugger Robot
b11236d53d Merge "Symlink prebuilt binaries on host." 2020-09-15 00:00:15 +00:00
Treehugger Robot
b72cdea7e8 Merge "LinuxBionic supports arm64" am: 5a1a88ee93 am: 298cc116ce am: 3728f3b498 am: 8c21946f2a am: 2d7ef4a0cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1409590

Change-Id: I8cec0b6df4ab9606e254e1720dfc89834196a193
2020-09-14 22:43:45 +00:00
Martin Stjernholm
809d51866a Heed SkipInstall flag when adding install rules for vendor-snapshot.
The prebuilt-vs-source selection operates by setting SkipInstall on
either module. When the vendor-snapshot module visits all modules it
will visit both, and if it is a static library it will then add
duplicate install rules for both source and prebuilt unless it
looks at SkipInstall.

Test: `m nothing` in a tree with prebuilts/runtime present, that
  has been updated with a snapshot after https://r.android.com/1398472,
  which started to propagate vendor_available flags to prebuilts
  snapshots.
Bug: 151303681
Change-Id: Ie425f0115e4180b7f4a8e682696697d55d666845
2020-09-14 22:15:42 +01:00
Treehugger Robot
5a1a88ee93 Merge "LinuxBionic supports arm64" 2020-09-14 15:59:16 +00:00
Colin Cross
680b11571f Merge "Use alias for test_per_src apex dependencies" am: a018b3df16 am: b524b7a9f6 am: a6aafd9d18 am: bf6baa6494 am: 2b90325fa0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1406260

Change-Id: I368bf31438820af7de33c2a5f0931763cde2cb4a
2020-09-12 22:42:10 +00:00
Colin Cross
a018b3df16 Merge "Use alias for test_per_src apex dependencies" 2020-09-12 20:21:36 +00:00
Colin Cross
13a8fbedca Make generated library SDK snapshots determinstic am: 2c033610e2 am: c16e34e85e am: f4e815c868 am: 9ebd1454ba am: ff5e805d8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1425997

Change-Id: Ifa4abaca9cbef1c4bef3b3abb43b51b558e39e0e
2020-09-12 19:51:22 +00:00
Treehugger Robot
535ab9a246 Merge "Propagate recovery_available property through to sdk snapshot" am: 05175c405b am: cd1c4bb58b am: 9cabaa47ad am: 00e9b68322 am: 4225ac8989
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1425730

Change-Id: I703c8de9746303bf48b81eac79809c32eb42a071
2020-09-12 00:14:56 +00:00
Yifan Hong
20146fced4 Merge "Sanitize APEX module name properly." am: c2c2d4e716 am: 18a051adfd am: b061c19fae am: 58e1a76367 am: 731da4e08d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1423412

Change-Id: I7258337155fdea260d786a8673d32c9ae5f89fdf
2020-09-12 00:10:18 +00:00
Colin Cross
2c033610e2 Make generated library SDK snapshots determinstic
Sort the include dir properties before printing them out of a map.

Test: m checkbuild
Change-Id: Ia924158755983631259ef0b53c369666de4e1d23
2020-09-11 23:10:39 +00:00
Colin Cross
90dab3498d Use alias for test_per_src apex dependencies
AddFarVariationDependencies was broken, which allowed apex to add
dependencies on tests by requesting an empty test_per_src variation
even though some test dependencies did not have a test_per_src
variation.  Add an alias from the pre-test_per_src variation
variant to the empty test_per_src variation, and drop the
test_per_src variation when requesting the depencency.

Test: TestApexWithTests
Change-Id: I2ed7bdd761027956141e25d4d81f9074afe628b6
2020-09-11 16:02:24 -07:00
Pirama Arumuga Nainar
0d1a961617 Merge "Set -fsjlj-exceptions for all 32-bit Windows compiles" am: 0710d8e1cc am: 46ac90bd23 am: ff5ebad225 am: 3d112bc9f2 am: 1a10457ac3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1424708

Change-Id: I85e8cd4f4f06e7c90945fb5cb1f4397cb45b17ee
2020-09-11 22:12:52 +00:00
Treehugger Robot
05175c405b Merge "Propagate recovery_available property through to sdk snapshot" 2020-09-11 21:16:07 +00:00
Paul Duffin
d6abaa71f8 Propagate recovery_available property through to sdk snapshot
Needed for jni_headers which is marked as recovery_available because libchrome
is also marked and that library is used by others that are the recovery
partition. There may be other dependency paths that require jni_headers to be
recovery_available that was just the first one found.

Bug: 168301990
Test: m nothing
Change-Id: I916ecfe7700b9c153b29115e849da148fc7e7a76
2020-09-11 16:09:28 +01:00
Yifan Hong
c2c2d4e716 Merge "Sanitize APEX module name properly." 2020-09-11 00:25:29 +00:00
Pirama Arumuga Nainar
0710d8e1cc Merge "Set -fsjlj-exceptions for all 32-bit Windows compiles" 2020-09-10 20:41:41 +00:00
Xin Li
80dc4f137a Merge "Merge Android R" 2020-09-10 17:22:09 +00:00
Pirama Arumuga Nainar
af68337d36 Set -fsjlj-exceptions for all 32-bit Windows compiles
Bug: http://b/116784799

Previously this was set only when stl was requested.  We can now pass
this for all C++ compilations.

Test: go/android-llvm-windows-testing
Change-Id: I43e635ff50d0f1a5e000f13021506aeece368b4a
2020-09-10 09:33:22 -07:00
Kousik Kumar
c10fd9d1c6 Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: f15ed4fe61 am: 4ed93ef2d6 am: 330184504b am: 08db7c4b37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252

Change-Id: I02fffd8b3b85a9fb4d0d4f6e314c7e287d3b8360
2020-09-10 11:17:24 +00:00
Kousik Kumar
f15ed4fe61 Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252

Change-Id: I52b7a3810fdf3314ae107f4b8330e9d6f62c6302
2020-09-10 09:50:35 +00:00
Kousik Kumar
3e0b9c031c Merge "Check UseRBE is set before replacing any template with the RE version." 2020-09-10 09:24:17 +00:00
Yifan Hong
f2ede7a137 Sanitize APEX module name properly.
An APEX module name, unlike the APEX package name, can contain
characters like '-', which are not allowed as C define strings.
Sanitize it properly.

Test: build GKI APEX
Change-Id: I8257d43c55862da8fab7f1e342c2d14369d1211e
2020-09-09 18:49:24 -07:00
Jiyong Park
4afa2e2682 LinuxBionic supports arm64
LinuxBionic now supports arm64 architecture in addition to the existing
x86_64 arch. This is to make it possible to build host tools like adb,
fastboot, crosvm, etc. for Linux/ARM on regular Linux/x86 machines.

The arm64 target can be selected in various ways in Android.bp files:

   - target.host (because this is still considered as a host target)
   - target.linux (provided that the module is also enabled for host)
   - target.linux_bionic (use the OS name directly)
   - target.linux_bionic_arm64 (OS name + arch combo)
   - target.linux_arm64 (provided that the module is also for host)
   - target.not_windows
   - arch.arm64

The toolchain for the new target is almost the same as the toolchain
config for Android/ARM64. One notable difference is that the clang
triple is aarch64-linux instead of aarch64-linux-android, so that
__ANDROID__ is not defined for the new OS type.

Bug: 134795810
Test: HOST_CROSS_OS=linux_bionic HOST_CROSS_ARCH=arm64 m nothing

Change-Id: If4300583edfb6d75bd4d984b38f73b6a406b4447
2020-09-09 21:57:10 +09:00
kellyhung
35fb1bea5c Add test_mainline_module option. am: 74b00521f8 am: af286f3312 am: dfde06a662 am: bf3f14866b am: a3e7f8354c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1402513

Change-Id: I423820f6df732c2f56bac6aeb538c24de21fb300
2020-09-09 09:59:47 +00:00
kellyhung
af286f3312 Add test_mainline_module option. am: 74b00521f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1402513

Change-Id: I4824247226e786363cf94815576a93da3deb73da
2020-09-09 08:06:35 +00:00
kellyhung
74b00521f8 Add test_mainline_module option.
Bug: 165425972

Test: m HelloWorldTests
Change-Id: I6e60b3895328c4f7aef0bfb30dcdefc30ee1d8ed
2020-09-09 02:15:39 +00:00
Treehugger Robot
757401b174 Merge "Add vendor snapshot usage test" am: f8123919aa am: 9e1ba22f14 am: efee92d1d5 am: 66a693fa7f am: 76880b3f5b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1420809

Change-Id: Id932888d9fef9f961ca24f750491aa90fda6d6e6
2020-09-09 01:45:35 +00:00
Treehugger Robot
9e1ba22f14 Merge "Add vendor snapshot usage test" am: f8123919aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1420809

Change-Id: I9b22b04a02f6b0e0fd6e76bd58a9e520e9c4d064
2020-09-09 00:05:23 +00:00
Treehugger Robot
f8123919aa Merge "Add vendor snapshot usage test" 2020-09-08 23:48:06 +00:00
Paul Duffin
e2612ece95 Merge "Propagate vendor_available property through to sdk snapshot" am: 4964a5e000 am: 4d38789695 am: 88653d7b56 am: 0ce96abbb0 am: 4ea9765689
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1398472

Change-Id: Ie7598a3204d1119bd138156a8191bbb823fac380
2020-09-07 16:37:29 +00:00
Paul Duffin
4d38789695 Merge "Propagate vendor_available property through to sdk snapshot" am: 4964a5e000
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1398472

Change-Id: I913a8e3cfd7eebb0a53ecd591b1bf12f69fa00b2
2020-09-07 15:20:07 +00:00
Paul Duffin
4964a5e000 Merge "Propagate vendor_available property through to sdk snapshot" 2020-09-07 14:58:20 +00:00
Inseob Kim
5f58ff7839 Add vendor snapshot usage test
In addition to capture test, this adds vendor snapshot usage test to
ensure the snapshots of BOARD_VNDK_VERSION are used correctly.

Bug: 167642944
Test: m nothing
Change-Id: I200c95626479a2b2d982edd7488d816e01376734
2020-09-07 19:56:43 +09:00
Bill Peckham
ae7b580dc0 Merge "Add exclude_from_vendor_snapshot property, related logic" am: e1359af34d am: f3bf78650a am: 5e7d0a3fed am: fa580836fc am: d6d12d5eb0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1416430

Change-Id: I37abedd1ebff86d1cf6281abb94ff3df34d2f6da
2020-09-03 19:37:09 +00:00
Bill Peckham
f3bf78650a Merge "Add exclude_from_vendor_snapshot property, related logic" am: e1359af34d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1416430

Change-Id: I89da13623f047a1651fb99b6a6ccc575cc75171c
2020-09-03 18:06:37 +00:00
Martin Stjernholm
837ee1a6df Symlink prebuilt binaries on host.
This means binaries will run from their source location and look up
shared libs relative to there.

Test: m nothing
Test: Set up a prebuilt binary with shared libs, check that it can
  be executed during build, and check that its symlinks get updated
  when a shared lib is touched.
Bug: 145934348
Change-Id: I1a600c7163ce0ec34ee8caf0ffe87fef4feb3064
2020-09-03 19:05:18 +01:00
Bill Peckham
e1359af34d Merge "Add exclude_from_vendor_snapshot property, related logic" 2020-09-03 17:52:29 +00:00
Paul Duffin
d1edbd4eed Propagate vendor_available property through to sdk snapshot
Test: m nothing
Change-Id: I68dcba111d290ae8a84c2bc023e1a4e0eaa43408
2020-09-03 18:49:35 +01:00
Yi Kong
5177d39b38 Merge "Revert "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO""" am: 4f78c512d4 am: 7daf77bbc6 am: d1eff8c1a6 am: a0435f1c0c am: 36a7b14410
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418988

Change-Id: I2f012f60d6aa6d559177f03d66aa7a0d803d5397
2020-09-03 09:52:37 +00:00
Yi Kong
7daf77bbc6 Merge "Revert "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO""" am: 4f78c512d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418988

Change-Id: I73355f33044be0378e395f06f2d3b52eeed08f59
2020-09-03 07:41:57 +00:00
Yi Kong
4f78c512d4 Merge "Revert "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO""" 2020-09-03 07:25:24 +00:00
Ramy Medhat
16f23a4038 Check UseRBE is set before replacing any template with the RE version.
Test: presubmit
Change-Id: I6df58b4e700f0d231367af2710672d731d20a736
2020-09-03 01:29:49 -04:00
Treehugger Robot
4633155996 Merge "AutoGen: Support NativeTest with vendor namespace." am: 52ddbe25f9 am: cab67c0dff am: 83c6df9f58 am: df829291b0 am: 414fc7b382
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399147

Change-Id: I18368d513fa6d7441c3fe46448ad7ba4fc6cad41
2020-09-03 04:49:11 +00:00
Treehugger Robot
cab67c0dff Merge "AutoGen: Support NativeTest with vendor namespace." am: 52ddbe25f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399147

Change-Id: I1d18daede7426969383666263a2a3aef27a5bc37
2020-09-03 03:07:06 +00:00
Colin Cross
7a142a4b78 Merge changes I59b7a32a,Ida7bc75a am: 0329f2398c am: 90d0500699 am: 3fa94fc983 am: 78395a8673 am: b443661414
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1406259

Change-Id: I0ab4e4c0775aaf9e08a582e714512e26094640ea
2020-09-03 02:34:00 +00:00
Treehugger Robot
52ddbe25f9 Merge "AutoGen: Support NativeTest with vendor namespace." 2020-09-03 02:26:11 +00:00
Colin Cross
90d0500699 Merge changes I59b7a32a,Ida7bc75a am: 0329f2398c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1406259

Change-Id: I9b2b709c59630394aa528c64b4fbe60b52d50be5
2020-09-03 00:21:49 +00:00