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
Colin Cross
0329f2398c
Merge changes I59b7a32a,Ida7bc75a
...
* changes:
Only request image and version variations for device SDK dependencies
Create os and arch variants for GoBinaryTool modules
2020-09-02 23:51:53 +00:00
Bill Peckham
945441c09a
Add exclude_from_vendor_snapshot property, related logic
...
When building a vendor snapshot, the general rule the
build system uses to select a module for inclusion into
the vendor snapshot is if it's a framework module.
However, there are cases where a partner may modify the
framework module, thereby assuming control of that
module.
This change adds the exclude_from_vendor_snapshot
property allowing the partner to mark a module that
would normally be included in the vendor snapshot for
exclusion. This module is then built from source when
building the vendor image against the vendor snapshot.
Bug: 165705527
Test: m nothing
Test: build partner code against vendor snapshot
Change-Id: I6c5c15f13eeeb8f29717a4abd84b65fa72096889
2020-09-02 22:27:45 +00:00
Pirama Arumuga Nainar
fe1da75972
Revert "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO""
...
This reverts commit 988ff8d149
.
Reason for revert: RBE can now handle PGO profiles during remote linking.
Bug: http://b/162702246
Test: m ANDROID_PGO_INSTRUMENT=hwui hwuimacro and check hwuimacro has
PGO instrumentation.
Change-Id: I724b53dc086923beeb6f4b8903136545d18f4ece
2020-09-02 17:44:06 +00:00
Jooyung Han
3be2358038
Merge commit '0703fd873fe2ed492266a4457a1e217971c2f4f0' into manual_merge_1e3d9fb376aaf1be6de1bd16a9004ccc95226ab0 am: 4c92cad10e
am: 4d565700b5
am: 378ff68eb5
am: 1b06154e8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12501269
Change-Id: I0e9a408b9547fad45983f39a5b7dbacd19b29c1d
2020-09-02 08:41:05 +00:00
Jooyung Han
4c92cad10e
Merge commit '0703fd873fe2ed492266a4457a1e217971c2f4f0' into manual_merge_1e3d9fb376aaf1be6de1bd16a9004ccc95226ab0
...
Change-Id: I7115a50254e23e3f7d9cdab960c671195746978e
2020-09-02 14:19:18 +09:00
Jooyung Han
3a92fbeaff
Merge "apex: support prebuilt_firmware for vendor apexes"
2020-09-02 04:17:43 +00:00
Xin Li
ca52d2ff53
Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master
2020-09-01 20:01:23 +00:00
Ramy Medhat
145fb37c7f
Merge "Pass cpp linking implicit deps to RBE." am: 3618f0a02e
am: d678bba6b6
am: 79e83919d8
am: c3d4c3d076
am: 00042e0745
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1414829
Change-Id: I5a1d786a0c0f3494d60c7e6206dbfe77e272a1b3
2020-09-01 13:22:54 +00:00
Ramy Medhat
79e83919d8
Merge "Pass cpp linking implicit deps to RBE." am: 3618f0a02e
am: d678bba6b6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1414829
Change-Id: I1edee6aa2ba229662856c0ff9a9566d86ca5e019
2020-09-01 12:12:45 +00:00
Ramy Medhat
3618f0a02e
Merge "Pass cpp linking implicit deps to RBE."
2020-09-01 11:19:28 +00:00
yangbill
5ec4555d22
AutoGen: Support NativeTest with vendor namespace.
...
Set the TEST_ROOT to /data/local/tmp/tests/vendor if LOCAL_VENDOR_MODULE or
LOCAL_USE_VNDK be set, if not, set to /data/local/tmp.
Bug: 138450837
Test: atest binderVendorDoubleLoadTest
Change-Id: I04acf12976dd24b9bf880a6775fa4f043a221001
2020-09-01 10:33:12 +08:00
Jooyung Han
0703fd873f
apex: support prebuilt_firmware for vendor apexes
...
prebuilt_firmware module is one of many prebuilt_etc-like modules. When
it is soc-specific, it is installed in /vendor/firmware. Similarly, when
prebuilt_firmware is embeded in a vendor apex, installing it in
<apex>/firmware instead of <apex>/etc.
Bug: 162701747
Test: lunch sunfish-userdebug
m && device boots && vibrator works
Change-Id: I00d28cde42259aaf8221e3897df77efc42b0c1ca
2020-09-01 10:45:13 +09:00
Xin Li
65cb5c69ea
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
...
Bug: 166295507
Merged-In: Ifca7b65f4e27bf14cdc30f72f790b0de90130bae
Change-Id: I3a39be5f0b8736de4822c6a14072c78d4e4ad89d
2020-08-29 01:17:45 -07:00
Matthias Maennich
2b718ea738
Merge "soong: add support for module specific lexer flags" am: bea94d3525
am: f4d8891660
am: 75826da3db
am: 71acf40e05
am: 9e6941979f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1363562
Change-Id: Ia2579d5dce996d8c350fedc8d66c67a51ef4860c
2020-08-28 21:21:50 +00:00
Matthias Maennich
75826da3db
Merge "soong: add support for module specific lexer flags" am: bea94d3525
am: f4d8891660
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1363562
Change-Id: I0480bbdd966aeb0233bfca66c20dbd7eb0c1608d
2020-08-28 20:03:19 +00:00
Matthias Maennich
bea94d3525
Merge "soong: add support for module specific lexer flags"
2020-08-28 19:24:01 +00:00
Ramy Medhat
6797edc70e
Pass cpp linking implicit deps to RBE.
...
Test: build with RBE_CXX=1 RBE_CXX_EXEC_STRATEGY=remote
Change-Id: Ie769b9a99f080b75c1b82e458b5220261e9c1b47
2020-08-28 14:53:44 -04:00
Thiébaud Weksteen
01113aa699
Merge "cc: export Stripper struct" am: 03156929db
am: 44c0a17793
am: 8bd1e224b0
am: 3704e0c13a
am: 7eab857e72
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1404788
Change-Id: I8261f736399edb4aa2c15466b723e6ed473a9200
2020-08-28 10:36:08 +00:00
Bowgo Tsai
02c81e214f
Merge "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO"" am: 38414db4de
am: aeca1f6aa0
am: dffdcb2d6a
am: 9b84bc3a5a
am: f27c2875ef
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1413430
Change-Id: I2666a33bf1d2c8ff60226a4d1a9335f7e3e84c27
2020-08-28 10:36:02 +00:00
Thiébaud Weksteen
8bd1e224b0
Merge "cc: export Stripper struct" am: 03156929db
am: 44c0a17793
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1404788
Change-Id: I0998951ffcde60254f69f99cf55cd564472990e9
2020-08-28 09:03:46 +00:00