StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,618 Commits 1 Branch 0 Tags
ab22ca31e93fbbd7827ec026e6df21962cbb2795
Commit Graph

23618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
ab22ca31e9 Merge "apex: add / in file_contexts as system_file" am: fae9e0cf9a am: 062e9afe7e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1351465

Change-Id: I9b4e3f4340b937df93be56867e557e53bb86fa30
 2020-07-02 04:41:34 +00:00
Treehugger Robot
062e9afe7e Merge "apex: add / in file_contexts as system_file" am: fae9e0cf9a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1351465

Change-Id: I1dab11f8feb4c61e02ddb0299fd54756de3ae10e
 2020-07-02 04:31:07 +00:00
Treehugger Robot
fae9e0cf9a Merge "apex: add / in file_contexts as system_file" 2020-07-02 04:22:46 +00:00
Treehugger Robot
2c3d9e54ea Merge "Dedup NDK library lists in make." am: 8cf2fda4c4 am: f9d5977467 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353449

Change-Id: I778fb22183dd0d6e47a2acd270d4c6f0f8015774
 2020-07-02 02:39:05 +00:00
Treehugger Robot
f9d5977467 Merge "Dedup NDK library lists in make." am: 8cf2fda4c4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353449

Change-Id: I71fb9df477b858276706af826e07ed3e7b27585b
 2020-07-02 02:29:20 +00:00
Treehugger Robot
8cf2fda4c4 Merge "Dedup NDK library lists in make." 2020-07-02 02:12:26 +00:00
Treehugger Robot
82fe912d84 Merge "Fix out/soong/Android-<>.mk reproducibility" am: 2e93eb702d am: 5ba520122b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353442

Change-Id: If2d5adb61a7218c5872b7c9d4d63aebe9ae4685a
 2020-07-02 01:29:23 +00:00
Treehugger Robot
5ba520122b Merge "Fix out/soong/Android-<>.mk reproducibility" am: 2e93eb702d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353442

Change-Id: I529e89400a980a585ba295c5e4a5fa985a1120be
 2020-07-02 01:13:38 +00:00
Treehugger Robot
2e93eb702d Merge "Fix out/soong/Android-<>.mk reproducibility" 2020-07-02 00:57:17 +00:00
Treehugger Robot
3cb9c88fc5 Merge "Rename module -> module-lib" am: 756aa63aee am: df1d1240f6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1340036

Change-Id: Iecb6be9e5bf6a25365c57dc53925511bcb0e9381
 2020-07-02 00:33:01 +00:00
Treehugger Robot
df1d1240f6 Merge "Rename module -> module-lib" am: 756aa63aee 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1340036

Change-Id: Ifc6c1b399002605de4cda1dbef22c858fc9ecb17
 2020-07-02 00:13:35 +00:00
Treehugger Robot
756aa63aee Merge "Rename module -> module-lib" 2020-07-01 23:58:07 +00:00
Matthew Maurer
ccbec7df4e Merge changes from topic "rust-flex" am: 367c01b19b am: cd39a5f2a2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353062

Change-Id: If10f92d7067c4cf1abd3b5aed5bf4a7f1003e116
 2020-07-01 22:57:15 +00:00
Matthew Maurer
7757349d2c rust: Mutate prebuilt modules dylib/rlib am: c761eeca48 am: 8ce15394c1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349327

Change-Id: Iebd8e1071476e664b96e47c14355c3f6816b1f57
 2020-07-01 22:57:13 +00:00
Matthew Maurer
ef44a883ca rust: Add rustlibs auto dependency selection am: 0f003b1851 am: 4b8457b422 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1347866

Change-Id: I2a54a24b3e626a8d65e6f1c1b3588eeae2ae1ca6
 2020-07-01 22:57:09 +00:00
Matthew Maurer
bd678fedf4 rust: Change default variants am: 2ae0513a8e am: f7aa77edfb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1347868

Change-Id: I0dd16046e2bb3018e4e01fcfe4df44a6d6c5e2d9
 2020-07-01 22:57:02 +00:00
Matthew Maurer
45e397150e rust: Fix Properties inheritance for prebuilts am: 128f53b3b4 am: 60d41b05d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353063

Change-Id: If85d6b1d395be0fe6335f2ba5e87fb5efddf53da
 2020-07-01 22:56:55 +00:00
Matthew Maurer
cd39a5f2a2 Merge changes from topic "rust-flex" am: 367c01b19b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353062

Change-Id: Ia79b3e0dc51ae55431e55b22b1329421e2678c9e
 2020-07-01 22:41:35 +00:00
Matthew Maurer
8ce15394c1 rust: Mutate prebuilt modules dylib/rlib am: c761eeca48 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349327

Change-Id: I70dbfeecfbb5d31df53790e12382495e2a9d5d2f
 2020-07-01 22:41:33 +00:00
Matthew Maurer
4b8457b422 rust: Add rustlibs auto dependency selection am: 0f003b1851 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1347866

Change-Id: I3bdcbb3770cd0fa28fdd8840cbb879dc1658423d
 2020-07-01 22:41:32 +00:00
Matthew Maurer
f7aa77edfb rust: Change default variants am: 2ae0513a8e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1347868

Change-Id: I63b7cdd97d36d524a25d3a7b64fe97bd377ed0f1
 2020-07-01 22:41:28 +00:00
Matthew Maurer
60d41b05d4 rust: Fix Properties inheritance for prebuilts am: 128f53b3b4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353063

Change-Id: Iab5949e9b76700fa9d565d160cd9d8a9cb8ee47c
 2020-07-01 22:41:24 +00:00
Matthew Maurer
367c01b19b Merge changes from topic "rust-flex" 
* changes:
  rust: Suppress default sysroot unconditionally
  rust: Mutate prebuilt modules dylib/rlib
  rust: Add rustlibs auto dependency selection
  rust: Change default variants
  rust: Fix Properties inheritance for prebuilts
 2020-07-01 22:26:44 +00:00
Treehugger Robot
30d7b755c8 Merge "Generate the known NDK libraries list." am: 2e1b8baeda am: 5f33df625a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353447

Change-Id: I3d5cdd456246b7b867d4f82a049c9016730d67dc
 2020-07-01 22:21:16 +00:00
Dan Willemsen
1a8c8565bd Fix out/soong/Android-<>.mk reproducibility 
When there were multiple modules overriding a single module, sometimes
we would create the list in different orders, which would trigger some
of the later mutators to write the Android-<>.mk out in different
orders.

Bug: 160207422
Test: diff out/soong/Android-<>.mk between multiple runs on internal master
Change-Id: I321db706dd34aa20a0b1556fd282d54b826a4a97
 2020-07-01 15:13:58 -07:00
Treehugger Robot
5f33df625a Merge "Generate the known NDK libraries list." am: 2e1b8baeda 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353447

Change-Id: I05725fdfbbd34ee839ac63ff5534a7c40643a122
 2020-07-01 21:57:23 +00:00
Treehugger Robot
2e1b8baeda Merge "Generate the known NDK libraries list." 2020-07-01 21:43:09 +00:00
Treehugger Robot
e5e011ff25 [automerger skipped] Merge "Output apkcerts file for android_app_set." am: 5aff3afce2 am: 694a75c63c -s ours 
am skip reason: Change-Id I321e80fd636a955213761f56a3ac64bfe7f7f7c0 with SHA-1 8bec026e3a is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1354062

Change-Id: I58e17f06ee958badc95b4bb415b84a5dca02d8e7
 2020-07-01 20:16:00 +00:00
Treehugger Robot
694a75c63c Merge "Output apkcerts file for android_app_set." am: 5aff3afce2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1354062

Change-Id: I6fe53574991f71e1ca84c19a16de86261700cb65
 2020-07-01 20:04:18 +00:00
Treehugger Robot
5aff3afce2 Merge "Output apkcerts file for android_app_set." 2020-07-01 19:53:33 +00:00
Matthew Maurer
c761eeca48 rust: Mutate prebuilt modules dylib/rlib 
This change makes it possible to use a single module to provide both
dylib and rlib varieties of a library. This allows the use of libstd and
libtest from a rustlibs property, allowing linkage type to change
for different variants.

Bug: 159718669
Test: cd external crates; mma; m crosvm.experimental
Change-Id: I477c4d2faec63703fdc6dd42ba020747d6a50714
 2020-07-01 11:27:12 -07:00
Matthew Maurer
0f003b1851 rust: Add rustlibs auto dependency selection 
Adds the rustlibs dependency type which will automatically select
between rlib and dylib based on the type of the library.

Bug: 143217452
Test: cd external/rust; mma
Change-Id: I97faadae98bf957090a32939cfb2d3a10f74a057
 2020-07-01 11:27:12 -07:00
Matthew Maurer
2ae0513a8e rust: Change default variants 
rust_library now produces only rlib and dylib variants.
rust_library_foreign now produces static and shared variants.

This change was made because both are common cases, but all four
together essentially never happens. This allows us to have fewer repeat
module definitions.

Bug: 143217452
Test: cd external/rust; mma
Change-Id: Iaf69e8da38f7c12710331c51464699cf7cbbb656
 2020-07-01 11:27:12 -07:00
Matthew Maurer
128f53b3b4 rust: Fix Properties inheritance for prebuilts 
Previously, we had just called AddProperties inside the factory on
libraryDecorator's properties directly. This inadvertantly missed their
MutatedProperties. Inheriting properties from libraryDecorator rather
than baseCompiler will avoid that type of error in the future.

Test: cd external/rust; mma; m crosvm.experimental
Change-Id: Ic08c410e69a8e272d63f9ffbdbe16ba9c3cc3de1
 2020-07-01 11:27:12 -07:00
Matthew Maurer
bb3add1104 rust: Suppress default sysroot unconditionally 
With proper prebuilt modules, we can avoid any rustc implicit sysroot
searching.

Asd a bonus, this should make rust-project.json generation correctly
grab otherwise implicit dependencies.

Prebuilt rlibs may include several dependency rlibs. Without a
link_dirs attribute, every dependency (even if unexported) would need a
separate module.

Previously we were casing out on exact structs, which might be OK when
libraryDecorator and procMacroDecorator were the only possibilities, but
repeating the logic for three types is too much. Using an interface
makes this logic scale better.

Bug: 159591910
Test: cd external/rust; mma; m crosvm.experimental
Change-Id: Ia1124e09f48cd05e39f094bbcb988622ebd2272f
 2020-07-01 11:27:12 -07:00
Thiébaud Weksteen
fba01f4ba7 Merge "Explicitly define Rust default lints" am: 6bbe5774a3 am: a1410c7f5e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353556

Change-Id: Icfbb046dc83aec96e7d589ad6d657eacc2c7b76d
 2020-07-01 17:57:15 +00:00
Treehugger Robot
12d1bde698 Merge changes Ib7ad715d,I3a83b5ed am: 7d9deed9fd am: 5befecfe64 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353932

Change-Id: Ic5de5a55a939f2a1ae8ce922c31e52b6f7c443e3
 2020-07-01 17:51:31 +00:00
Thiébaud Weksteen
a1410c7f5e Merge "Explicitly define Rust default lints" am: 6bbe5774a3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353556

Change-Id: I363b2bc2d42f4bb7bc88fe90be8884661bb5c971
 2020-07-01 17:51:29 +00:00
Thiébaud Weksteen
6bbe5774a3 Merge "Explicitly define Rust default lints" 2020-07-01 17:38:58 +00:00
Treehugger Robot
5befecfe64 Merge changes Ib7ad715d,I3a83b5ed am: 7d9deed9fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353932

Change-Id: Ib5967801f9d3a6b143a50f59f77820e13a918d81
 2020-07-01 17:33:04 +00:00
Treehugger Robot
7d9deed9fd Merge changes Ib7ad715d,I3a83b5ed 
* changes:
  Remove frameworkResModule from sdkCorePlatform.
  Remove the concept of useDefaultLibs from Soong.
 2020-07-01 17:23:46 +00:00
Treehugger Robot
d756fc76d1 Merge "Add BenchmarkProperties to cc_defaults" am: e6b5e9aa82 am: d922debd99 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353047

Change-Id: Ib727d19617af5e15289edcba4a3f54cc31eb19fd
 2020-07-01 17:09:28 +00:00
Jaewoong Jung
11c1e0f94d Output apkcerts file for android_app_set. 
Soong and Make have no ways to figure out what splits will be outputted
from a given android_app_set, so it's impossible for them to provide
full PACKAGES.$(LOCAL_MODULE).CERTIFICATE entries, which are required to
build a final apkcerts.txt. This change makes extract_apks produce
apkcerts.txt files for each input modules instead. The Make-side
counterpart of this change merges all local apkcerts.txt into a final
one.

Fixes: 160119159
Test: main_test.go
Test: m apkcerts-list
Merged-In: I321e80fd636a955213761f56a3ac64bfe7f7f7c0
Change-Id: I321e80fd636a955213761f56a3ac64bfe7f7f7c0
 2020-07-01 10:03:09 -07:00
Treehugger Robot
d922debd99 Merge "Add BenchmarkProperties to cc_defaults" am: e6b5e9aa82 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353047

Change-Id: I7182cf2dc9c83c7d740badc2c470d90d2b129e0d
 2020-07-01 16:59:20 +00:00
Treehugger Robot
e6b5e9aa82 Merge "Add BenchmarkProperties to cc_defaults" 2020-07-01 16:46:11 +00:00
Colin Cross
28ec498840 Merge changes Ie33d2e05,Ie2b4509b,I5ac3a1f5 am: 8ec6261388 am: 342c28eb01 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353385

Change-Id: I7b1a5663e182fa7fcef159b2db4af36ce3fa5366
 2020-07-01 16:09:56 +00:00
Colin Cross
342c28eb01 Merge changes Ie33d2e05,Ie2b4509b,I5ac3a1f5 am: 8ec6261388 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353385

Change-Id: Ia43082a9479e4a3379f9726f3a9ea8842c7b89eb
 2020-07-01 15:54:45 +00:00
Colin Cross
8ec6261388 Merge changes Ie33d2e05,Ie2b4509b,I5ac3a1f5 
* changes:
  Fix finder on symlinks pointing to directories
  Add Stat to finder/fs
  Move finder_test filesystem helper functions to fs/test.go
 2020-07-01 15:42:22 +00:00
Treehugger Robot
8034eafbed Merge "Rename the Default* constants in java/config." am: 8f70db2b48 am: 98d8ee9bd8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353886

Change-Id: Ibf0533b6bd01244d30c5df89aa849a7f8da6f777
 2020-07-01 15:25:53 +00:00
Thiébaud Weksteen
8e46efac71 Explicitly define Rust default lints 
Add documentation on how lints are defined and used in Android. Merge
the deny_warnings attribute with a new attribute (no_lint) which can be
used to disable the default linting parameters.
Explicitly allow all lints for external/ and prebuilts/, which remove
any warning when building sysroot for the devices.

Test: cd external/rust/crates; mma
Test: add dummy internal Rust module; mma
Change-Id: I62be1c41aeda4068fb9e288038727c1de5ffe547
 2020-07-01 17:11:58 +02:00