Commit Graph

46994 Commits

Author SHA1 Message Date
Rupert Shuttleworth
d469eefcc3 Merge "Handle includes for generated headers" am: 6f32f95b25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918455

Change-Id: I2f5a84791ff7f396ae0b1cb571c46a8f9810f9f0
2021-12-14 00:26:34 +00:00
Rupert Shuttleworth
6f32f95b25 Merge "Handle includes for generated headers" 2021-12-14 00:11:26 +00:00
Matthew Maurer
a946b1b117 Merge "rust: Migrate default edition to 2021" am: c207773056
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1920524

Change-Id: Iee94c8ee0f7cc2da511aaeee315c6ac1451a71d3
2021-12-13 21:30:53 +00:00
Matthew Maurer
c207773056 Merge "rust: Migrate default edition to 2021" 2021-12-13 21:10:13 +00:00
Treehugger Robot
32c7110a57 Merge "Java used-by API list generation" am: 34e9ae2802
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918453

Change-Id: Ia9e8c929d301f984b9565f9703e9c26d1bfec36f
2021-12-13 20:51:00 +00:00
Treehugger Robot
34e9ae2802 Merge "Java used-by API list generation" 2021-12-13 20:28:54 +00:00
Matthew Maurer
c1738b449b rust: Migrate default edition to 2021
Bug: 210475268
Test: Presubmit
Change-Id: I915a8779c032dc463bf76a1a41f545d29a7be044
2021-12-13 18:20:53 +00:00
Liz Kammer
1263d9bdb1 Handle includes for generated headers
For generated headers, Soong introduces the package to the includes (and
re-exports as necessary).

Test: bp2build.sh
Change-Id: Iea9cda859ddaa3e5393f0f4533c15fc60222c408
2021-12-13 12:06:39 -05:00
Martin Stjernholm
49df6778ca Merge "Do not allow duplicate deapexer dependencies." am: d7c3fc0ae0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1752641

Change-Id: I14c67990dfd06d096e40f24430ef407ded4a8859
2021-12-13 16:07:20 +00:00
Martin Stjernholm
d7c3fc0ae0 Merge "Do not allow duplicate deapexer dependencies." 2021-12-13 15:52:19 +00:00
Rupert Shuttleworth
afbbd4316d Add initial support for use_version_lib. am: 484aa25875
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918278

Change-Id: I9a5320f41df829088a7df3f6d4297442b303b91a
2021-12-13 14:00:14 +00:00
Rupert Shuttleworth
484aa25875 Add initial support for use_version_lib.
Test: Resolves build error for BP2BUILD_VERBOSE=1 b build //packages/modules/adb:libadbd_core
Test: Added unit test

Bug: 208481704

Change-Id: I4022c686c7baf050de3f97295fe4654515622a66
2021-12-13 06:21:16 -05:00
Jingwen Chen
d6b0aab0cd Merge "bp2build: Fix apex.binaries to be a LabelListAttribute." am: 8d0bd355fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913474

Change-Id: If2bbf9c060a9730495119f2e662b0183d81a0d66
2021-12-13 10:25:54 +00:00
Jingwen Chen
8d0bd355fd Merge "bp2build: Fix apex.binaries to be a LabelListAttribute." 2021-12-13 10:03:50 +00:00
Alexander Smundak
f0e94114d7 Merge "Suppress all progress messages from Ninja if ANDROID_QUIET_BUILD is set." am: 789e5026b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895824

Change-Id: Iebeaa0117931c3255173d0d98738a43a59b191c8
2021-12-12 22:49:18 +00:00
Alexander Smundak
789e5026b4 Merge "Suppress all progress messages from Ninja if ANDROID_QUIET_BUILD is set." 2021-12-12 22:26:58 +00:00
Treehugger Robot
45b20269f6 Merge changes from topic "revert-1918946-revert-1899703-AMWIVCREEV-CCTEXIRRRV" am: f4c2bf6559
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918949

Change-Id: I2ed8190fa32f751c1c79dd0417e5966532e5b031
2021-12-11 03:48:27 +00:00
Colin Cross
d8395b1b2f Revert^2 "Build license metadata files in Soong" am: 4acaea9cbf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918948

Change-Id: I8682f46f7843e0d367b96a09135dad03e3df934c
2021-12-11 03:48:25 +00:00
Treehugger Robot
f4c2bf6559 Merge changes from topic "revert-1918946-revert-1899703-AMWIVCREEV-CCTEXIRRRV"
* changes:
  Revert^2 "Add dependency license annotations"
  Revert^2 "Build license metadata files in Soong"
2021-12-11 03:32:18 +00:00
Sasha Smundak
827aead340 Suppress all progress messages from Ninja if ANDROID_QUIET_BUILD is set.
Test: build with ANDROID_QUIET_BUILD=true, observe no progress messages
Change-Id: I98b9a657affa2ebbf86c9c081d51c31698072fed
2021-12-10 16:42:34 -08:00
Colin Cross
34ca826598 Merge changes from topic "revert-1899703-AMWIVCREEV" am: 67938c2925
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918944

Change-Id: Ie9cf2ab1249044ce0b52b8511c0a49e11f74a484
2021-12-10 23:20:51 +00:00
Colin Cross
a7fcadce74 Revert "Add dependency license annotations" am: abe2a4b7bf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918943

Change-Id: I9438dc5f70a9e30071a051c11dd25f36789822d0
2021-12-10 23:20:49 +00:00
Colin Cross
4acaea9cbf Revert^2 "Build license metadata files in Soong"
b3264f2090

Change-Id: I5ea5f7e29eb1dbc72b8b30f010006a25f5f72fac
2021-12-10 23:05:02 +00:00
Colin Cross
65cb314c92 Revert^2 "Add dependency license annotations"
abe2a4b7bf

Change-Id: Ibcd16b5b779a4e6d4372dab9d21de76abae9ca9c
2021-12-10 23:05:02 +00:00
Colin Cross
67938c2925 Merge changes from topic "revert-1899703-AMWIVCREEV"
* changes:
  Revert "Build license metadata files in Soong"
  Revert "Add dependency license annotations"
2021-12-10 23:04:45 +00:00
Colin Cross
b3264f2090 Revert "Build license metadata files in Soong"
Revert submission 1899703

Reason for revert: b/210158272
Reverted Changes:
I142c19284:Reuse license metadata files from Soong
Ife89b8f23:Add dependency license annotations
I8e7410837:Build license metadata files in Soong

Change-Id: I48f2bf2e2797ac9d38f7ece35ba616b823035607
2021-12-10 23:02:57 +00:00
Colin Cross
abe2a4b7bf Revert "Add dependency license annotations"
Revert submission 1899703

Reason for revert: b/210158272
Reverted Changes:
I142c19284:Reuse license metadata files from Soong
Ife89b8f23:Add dependency license annotations
I8e7410837:Build license metadata files in Soong

Change-Id: I51f33ae67311a3cff00d3e581d24c9a3411b7131
2021-12-10 23:02:41 +00:00
Colin Cross
9a6e17e5c1 Merge changes from topic "soong-license-metadata" am: b435744fdc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899703

Change-Id: Ie9ffd26bb391ae9bd0ca946dbd01a2e2e076da6c
2021-12-10 22:04:44 +00:00
Colin Cross
05ff6289c2 Build license metadata files in Soong am: 3dd2ff28ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899702

Change-Id: I96620d254f43dd9e8cfe02d1ed1dbc201c9cd381
2021-12-10 22:04:43 +00:00
Colin Cross
72d35eb0a5 Escape Host*Variable contents am: 1c35f243c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1915494

Change-Id: I78a98453a932c7cace65bfaf0c2d39a2469342e6
2021-12-10 22:04:40 +00:00
Colin Cross
b435744fdc Merge changes from topic "soong-license-metadata"
* changes:
  Add dependency license annotations
  Build license metadata files in Soong
  Escape Host*Variable contents
2021-12-10 21:43:49 +00:00
sophiez
65a981569f Java used-by API list generation
Wrap the dexdeps output content with "<externals></externals>" to
simplify backend xml parsing.

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only
Change-Id: I1457eb9558763e50911dc9c689b9bc3fb833a52c
2021-12-10 13:43:10 -08:00
Sorin Basca
2aabb8de52 Merge "Adding experimental option to target Java 11" am: eb59a6d3ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1904231

Change-Id: I0f2cf1d6dbfe020e906260978c9395b669f94032
2021-12-10 14:21:25 +00:00
Sorin Basca
eb59a6d3ea Merge "Adding experimental option to target Java 11" 2021-12-10 13:57:51 +00:00
Inseob Kim
8bc61f24aa Merge "Add BoardPlatVendorPolicy to soong config" am: fcaea66933
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913480

Change-Id: I882ab7fa943f53edf0a7fe0dea603bff25662f18
2021-12-10 12:29:48 +00:00
Inseob Kim
fcaea66933 Merge "Add BoardPlatVendorPolicy to soong config" 2021-12-10 12:13:36 +00:00
Treehugger Robot
25f3ae24eb Merge "Replace Rust global arg with more legible alternative" am: 10fed2697e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1917677

Change-Id: Ia1fb52fdff5f073c34ca7e5aec0ddc6a8e3f57a2
2021-12-10 03:01:23 +00:00
Treehugger Robot
10fed2697e Merge "Replace Rust global arg with more legible alternative" 2021-12-10 02:44:21 +00:00
Remi NGUYEN VAN
b68677917b Merge "Relax apex package restriction for T+ jars" am: 4d5cd1f267
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1908871

Change-Id: Ie5385ce14e712ab5c74954d1ce9c56f25bbb5df2
2021-12-10 00:17:57 +00:00
Spandan Das
a9938be03e Merge "Set targetSdkVersion to 10000 iff a module is targeting an unreleased sdk" am: 2ee7ac02e7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914977

Change-Id: I163ddc446e92e825d3772e83c0e7da8f4ea7c236
2021-12-10 00:17:47 +00:00
Remi NGUYEN VAN
4d5cd1f267 Merge "Relax apex package restriction for T+ jars" 2021-12-10 00:15:17 +00:00
Spandan Das
2ee7ac02e7 Merge "Set targetSdkVersion to 10000 iff a module is targeting an unreleased sdk" 2021-12-09 23:56:37 +00:00
Chris Wailes
bc62193c7f Replace Rust global arg with more legible alternative
Bug: 201431719
Test: m rust
Change-Id: I5e0fae74e1df02f059ddcfa004b29059126a52e0
2021-12-09 13:56:32 -08:00
Liz Kammer
d8db779bef Merge "Add test for performance testing" am: 8f3da38b70
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879796

Change-Id: I484a0df80ecfe0131c4a07b13d23082be8822204
2021-12-09 20:50:41 +00:00
Treehugger Robot
1bc4f14604 Merge "The type assertion of DefaultableModule as Module is redundant Test: m nothing Bug: n/a" am: 37dd05bbbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914978

Change-Id: If2dae08811d14d8a549c90a922970b07bf5ab935
2021-12-09 20:49:12 +00:00
Liz Kammer
8f3da38b70 Merge "Add test for performance testing" 2021-12-09 20:46:56 +00:00
Treehugger Robot
37dd05bbbe Merge "The type assertion of DefaultableModule as Module is redundant Test: m nothing Bug: n/a" 2021-12-09 20:02:24 +00:00
Colin Cross
8211f7f7b8 Merge "Set prebuiltCommon.installedFile for apex_set modules" am: 3c48297dde
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1915701

Change-Id: I1a13a7b722ead7c80bde100a4ce20d2a47b97c25
2021-12-09 18:38:51 +00:00
Spandan Das
c8cb0c3eb5 Set targetSdkVersion to 10000 iff a module is targeting an unreleased
sdk

Previously in aosp/1907152, targetSdkVersion for all modules would be
10000 in release builds. This would cause sdk compatibility errors like
b/209301265#3 for modules that were targeting a released SDK

This CL adds an additional check to set targetSdkVersion to 10000 only
if a module's apilevel is in preview (i.e. unreleased SDK)

Bug: 209301265

Test: Built various apk combinations locally, and used aapt2 to check
targetSdkVersion
Test: TARGET_BUILD_APPS=xyz m CaptivePortalLoginTests #
targetSdkVersion: 30
Test: m CaptivePortalLoginTests #targetSdkVersion: 30
Test: (internal) TARGET_BUILD_APPS=xyz m MediaProviderGoogle #
targetSdkVersion: 10000
Test: (internal) m MediaProviderGoogle #targetSdkVersion: Tiramisu

Change-Id: Id2901f23d4e1b436f8906940e47edd606a93657d
2021-12-09 18:08:28 +00:00
Colin Cross
3c48297dde Merge "Set prebuiltCommon.installedFile for apex_set modules" 2021-12-09 18:06:36 +00:00