Commit Graph

25121 Commits

Author SHA1 Message Date
Ulyana Trafimovich
c2c40cdbc5 Merge "Replace is_uses_lib property with provides_uses_lib." am: 79a94a27b6 am: df9afcd9b6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1423137

Change-Id: I616303810067a1e1cd6db7367163d3d1125ea629
2020-09-10 15:52:29 +00:00
Ulyana Trafimovich
df9afcd9b6 Merge "Replace is_uses_lib property with provides_uses_lib." am: 79a94a27b6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1423137

Change-Id: I22b08e951667d14b03a52b091ae34ebb885d5fd9
2020-09-10 14:58:14 +00:00
Ulyana Trafimovich
79a94a27b6 Merge "Replace is_uses_lib property with provides_uses_lib." 2020-09-10 14:34:20 +00:00
Kousik Kumar
4ed93ef2d6 Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: f15ed4fe61
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252

Change-Id: Ib20373674f64449731a151726ade8bab52a14661
2020-09-10 10:03:52 +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
Ulya Trafimovich
54027b572e Replace is_uses_lib property with provides_uses_lib.
The previous property was boolean-valued and provided only the
information whether the library should be treated as <uses-library>
by Soong. The new property is an optional string, which is the name of
the <uses-library>. The name can be different from the module name, as
in the case of "qcrilhook" module which provides <uses-library>
"com.qualcomm.qcrilhook".

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: I65b68e6f7c420ab9c443a76de4c917d31fcd8c8f
2020-09-10 10:47:41 +01: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
Treehugger Robot
dae2bca0a8 Merge "Notice files for prebuilt_etc are included in APEX" am: 4f35976c87 am: 410b20dba2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1421373

Change-Id: I6e117c38efbafe6adf855114ab73ac978a2dd073
2020-09-10 00:46:04 +00:00
Treehugger Robot
410b20dba2 Merge "Notice files for prebuilt_etc are included in APEX" am: 4f35976c87
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1421373

Change-Id: Ifbfd71ff4416b07742e70c9d9aba523d60af1d2b
2020-09-10 00:30:29 +00:00
Treehugger Robot
4f35976c87 Merge "Notice files for prebuilt_etc are included in APEX" 2020-09-10 00:06:13 +00:00
Ivan Lozano
8a696b4120 Merge "rust: Fix rust_bindgen implicits" am: 74fe471e7a am: fbd7372401
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1414831

Change-Id: If6a5a307d54d1072e06f040ad5abdd16a4c175e5
2020-09-09 23:00:16 +00:00
Ivan Lozano
f539922486 Merge "rust: Pass lld flags from cc to rust linker args." am: 0eef27a556 am: e9505a11dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1423408

Change-Id: I3dd22036fb37bf74a30ad9f24ed4e6947ca5e833
2020-09-09 23:00:06 +00:00
Ivan Lozano
fbd7372401 Merge "rust: Fix rust_bindgen implicits" am: 74fe471e7a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1414831

Change-Id: I9d5d0da0f409bd6b131f7e0f6363be061d3045c1
2020-09-09 22:33:23 +00:00
Ivan Lozano
e9505a11dc Merge "rust: Pass lld flags from cc to rust linker args." am: 0eef27a556
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1423408

Change-Id: Ifd87a8b20d6613b5f38287dfebb9d45f353a5646
2020-09-09 22:32:03 +00:00
Ivan Lozano
74fe471e7a Merge "rust: Fix rust_bindgen implicits" 2020-09-09 22:04:38 +00:00
Ivan Lozano
0eef27a556 Merge "rust: Pass lld flags from cc to rust linker args." 2020-09-09 22:03:23 +00:00
Ivan Lozano
6d45a9863a rust: Pass lld flags from cc to rust linker args.
Rust is not passing the sysroot flag to Clang when invoking it as the
linker. This means files from the host may leak in, and host targets
may fail if sysroot files are not available from the host.

This patch prepends the lld flags from cc into rust linkargs. This
pulls in the sysroots flag, and also ensures that we remain in sync
with linkage flags used in cc.

The '-Wl,--no-undefined-version' from cc is overridden to avoid
missing version assignment errors for rust's generated alloc
functions.

Bug: 167690054
Test: cd external/rust; mma
Test: strace -f -e %file <host libstd.dylib.so build command> pulls
      from correct sysroots.
Change-Id: Ic40597f546f3b112012155614056afed487c6ca1
2020-09-09 14:20:00 -04:00
Ivan Lozano
e042d48414 Merge "[rust] Fix missing libclang for bindgen on darwin." am: 29139f9c02 am: 4fa4c9ef84
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1421828

Change-Id: Ic7106b3f9a4cc13954d5c5a007ed851441edd32b
2020-09-09 13:24:52 +00:00
Ivan Lozano
4fa4c9ef84 Merge "[rust] Fix missing libclang for bindgen on darwin." am: 29139f9c02
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1421828

Change-Id: Ic3a90644291856a0b4b89f72ea8886161109ed92
2020-09-09 12:53:51 +00:00
Ivan Lozano
29139f9c02 Merge "[rust] Fix missing libclang for bindgen on darwin." 2020-09-09 12:27:34 +00:00
kellyhung
dfde06a662 Add test_mainline_module option. am: 74b00521f8 am: af286f3312
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1402513

Change-Id: Ic106ee62bfa73ad277399392f86cc65e01ae4e5f
2020-09-09 08:33:39 +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
Jiyong Park
41f637d653 Notice files for prebuilt_etc are included in APEX
This change fixes a bug that notice files for some module type (e.g.
prebuilt_etc) were not included in APEX. This happened because we relied
on WalkPayloadDeps which actually doesn't traverse module types that
don't implement ApexModule interface. prebuilt_etc is one such module
type. Fixing the problem by also iterating the filesInfo array which
has info about all modules that are included in the APEX.

Bug: 166575301
Test: m com.android.tzdata and inspect the built artifact.
NOTICE.html.gz is there.

Change-Id: Iceb055b60184aef2a3e65e44680304853eb79a53
2020-09-09 13:19:56 +09: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
b2cf8359ea Merge "Don't assume host arch is always x86" am: daf735287b am: 9ef1f7d96a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1415953

Change-Id: I01389ff5f315177d2a999ccd12cd34a24025fefd
2020-09-09 00:41:16 +00:00
Treehugger Robot
9ef1f7d96a Merge "Don't assume host arch is always x86" am: daf735287b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1415953

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

Change-Id: I7d6d165ec180212de7d03922f0113ac59f0c1a0a
2020-09-09 00:32:15 +00:00
Treehugger Robot
daf735287b Merge "Don't assume host arch is always x86" 2020-09-09 00:13:50 +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
Ivan Lozano
54a8ee12fe [rust] Fix missing libclang for bindgen on darwin.
The LIBCLANG_PATH provided to bindgen should point to the directory
containing libclang, not the file itself.

Bug: 167977778
Test: m profcollectd
Change-Id: Iabd9970a763c192249b401a618a2d6990b02eab0
2020-09-08 13:13:07 -04:00
Ulyana Trafimovich
84ed91df7d Merge "Be more strict about unknown install <uses-library> paths." am: 117a5ef307 am: 0f13eff149
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418529

Change-Id: I5041867e457407f6c103cd0788da5f3f7ef4597c
2020-09-08 15:49:36 +00:00
Ulyana Trafimovich
0f13eff149 Merge "Be more strict about unknown install <uses-library> paths." am: 117a5ef307
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418529

Change-Id: Ib28e902e7f8ec57a15ef50692024cd37a96696bc
2020-09-08 15:34:50 +00:00
Ulyana Trafimovich
117a5ef307 Merge "Be more strict about unknown install <uses-library> paths." 2020-09-08 15:21:30 +00:00
Jiyong Park
87788b5247 Don't assume host arch is always x86
This change fixes some places where host arch is assumed to be x86 to
form a path element like linux-x86. In preparation for non-x86 host
targets, the host arch part is derived from the context.

In addition, InstallForceOS() is refactored so that it can override not
only OsType, but also ArchType. Without this, the paths for the
robolectic modules will be changed from linux-x86 to linux-common, which
breaks several other places where the old paths are expected.

Bug: 134795810
Test: m
Change-Id: Ib38c715948ae546e55021ece82bac1d82e9e5da0
2020-09-08 15:12:10 +09:00
Paul Duffin
88653d7b56 Merge "Propagate vendor_available property through to sdk snapshot" am: 4964a5e000 am: 4d38789695
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1398472

Change-Id: I4ade818a8cb4c0a75349da2cd7f17c1f2c6cba4a
2020-09-07 15:45:18 +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
Ulya Trafimovich
045e11ad0d Be more strict about unknown install <uses-library> paths.
Allow default install paths only for compatibility libraries. For other
libraries that are explicitly specified in `uses_libs` and
`optional_uses_libs` unknown install path should be an error.

Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Change-Id: I2209c90a939a8aa46c42e13bb42d09c07e4d0895
2020-09-07 13:58:51 +01: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
Ulyana Trafimovich
b55d73f706 Merge "Allow non-SDK Java libraries to masquerade as <uses-library>." am: bb3467d297 am: 99bd329274
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1417188

Change-Id: Ic296804ef1333135f50857ded157689693eb56ff
2020-09-07 10:39:18 +00:00
Ulyana Trafimovich
99bd329274 Merge "Allow non-SDK Java libraries to masquerade as <uses-library>." am: bb3467d297
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1417188

Change-Id: If25aaa0174091e966cc5c6b16063b6486a7b4ab6
2020-09-07 10:23:53 +00:00
Ulyana Trafimovich
bb3467d297 Merge "Allow non-SDK Java libraries to masquerade as <uses-library>." 2020-09-07 09:49:07 +00:00
Mark Chien
05e47c0c5d Merge "Include bpf program in APEXes" am: 66a0ae60f8 am: 288f40ba51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418308

Change-Id: I42631beea4e668d86ba437d3e2edb392137706f0
2020-09-04 09:25:36 +00:00
Mark Chien
288f40ba51 Merge "Include bpf program in APEXes" am: 66a0ae60f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418308

Change-Id: I86983c1012615e95d1d9aac875a52e92248a17b8
2020-09-04 09:11:22 +00:00
Mark Chien
66a0ae60f8 Merge "Include bpf program in APEXes" 2020-09-04 08:58:21 +00:00
Treehugger Robot
e124bd97d9 Merge "Iterate <uses-library> in deterministic order in manifest_fixer." am: bfb98ece49 am: da55e8208f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418533

Change-Id: Icd116d796253e1062d0cc28c985becf03bd30238
2020-09-04 01:35:10 +00:00
Treehugger Robot
da55e8208f Merge "Iterate <uses-library> in deterministic order in manifest_fixer." am: bfb98ece49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418533

Change-Id: I42df02457960f99d3257d131524d8005e2c7a97e
2020-09-04 01:17:25 +00:00
Treehugger Robot
bfb98ece49 Merge "Iterate <uses-library> in deterministic order in manifest_fixer." 2020-09-04 00:45:48 +00:00
Treehugger Robot
cc4fb483cb Merge "Add imports_compile_dex to prebuilt_apis" am: cda9a92efb am: 48e2acaf99
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418868

Change-Id: I87f5460a1351469bd3529890f57aca829861a11e
2020-09-04 00:27:39 +00:00