Commit Graph

39111 Commits

Author SHA1 Message Date
Paul Duffin 1d58079c9c Merge "Support test fixtures in java package" am: 29e98e5ede
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625388

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95df61b5ae8df324258623c760f9ece1c4a0c1e5
2021-03-10 23:05:24 +00:00
Paul Duffin 5a9dbbbb92 Merge "Support test fixtures in dexpreopt package" am: 4ce31e448f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625387

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If611e62cdd301efb7899221ba34fbc179ba33a9f
2021-03-10 23:04:49 +00:00
Colin Cross 42e49979f2 Merge "Add comment to lintPaths" 2021-03-10 22:55:03 +00:00
Colin Cross 75a38ba791 Merge "Revert "Skip old file cleanup for non-full builds."" 2021-03-10 22:53:43 +00:00
Paul Duffin 07d76a4ec2 Merge changes Ib2c6ac28,I7c76ed6d,I00415f10,I4be2a16c,I6f269c9c, ... am: 67e848ab04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625385

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic13069217603fb937f20712dd67fe03ecd52ea97
2021-03-10 22:49:56 +00:00
Paul Duffin a11ec1f568 Merge "Convert genrule tests to use test fixtures" am: 6edc952d89
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica7711f65261ff51862424b5c8f3611a0322aa9d
2021-03-10 22:33:16 +00:00
Paul Duffin 29e98e5ede Merge "Support test fixtures in java package" 2021-03-10 22:27:00 +00:00
Paul Duffin 4ce31e448f Merge "Support test fixtures in dexpreopt package" 2021-03-10 22:04:31 +00:00
Paul Duffin 67e848ab04 Merge changes Ib2c6ac28,I7c76ed6d,I00415f10,I4be2a16c,I6f269c9c, ...
* changes:
  Support test fixtures in sh package
  Support test fixtures in bpf package
  Support test fixtures in cc package
  Add temporary RunTestWithConfig method to simplify migration
  Support test fixtures in etc package
  Convert license tests to use test fixtures
2021-03-10 21:52:17 +00:00
Paul Duffin 6edc952d89 Merge "Convert genrule tests to use test fixtures" 2021-03-10 21:51:47 +00:00
Paul Duffin b0490caf89 Merge "Remove duplicate sdk.TestHelper" am: 3b2636fdf3 am: a4513a42db am: 010db8f3d3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625389

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0e06bb1511638e33bf51a70e6de579d0a02b129
2021-03-10 21:03:14 +00:00
Colin Cross 0e434dde79 Merge changes from topic "lint_rbe" am: 068f33f6cf am: d475665a61 am: c6b8d7f70e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621780

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f224d2aac889c6325c38415df2da3e3778fe2ea
2021-03-10 21:03:05 +00:00
Paul Duffin b1f797322c Merge "Simplify TestSdkInstall" am: 19afb3c0c3 am: 1553539301 am: 9fb55797b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625381

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5fad8e24041577490b84c1548b6bf1de683c39c
2021-03-10 21:02:57 +00:00
Paul Duffin daa32bcc18 Merge "Extract sdk registration code into function for reuse" am: 8bee400a74 am: df21923819 am: b5424164d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625380

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c92c15e97f6ff97f5db50993173f8ad30097450
2021-03-10 21:02:49 +00:00
Paul Duffin d3bf0fad8f Merge "Extract apex registration code into function for reuse" am: 3d3f7a0c3f am: 5dccf644f1 am: 0f9e7887fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ea84198248eab3591b7b065b065478ac400bd01
2021-03-10 21:00:54 +00:00
Paul Duffin 010db8f3d3 Merge "Remove duplicate sdk.TestHelper" am: 3b2636fdf3 am: a4513a42db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625389

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac586ddcede0533081699f9096eea2ba9f94672b
2021-03-10 20:32:14 +00:00
Colin Cross c6b8d7f70e Merge changes from topic "lint_rbe" am: 068f33f6cf am: d475665a61
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621780

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib93088ac7ffae99efebbfd8dc372724d80bd77e0
2021-03-10 20:32:04 +00:00
Paul Duffin a4513a42db Merge "Remove duplicate sdk.TestHelper" am: 3b2636fdf3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625389

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id752a1f90ee457053d67099d8755ed0be02a79ca
2021-03-10 20:27:14 +00:00
Paul Duffin 9fb55797b4 Merge "Simplify TestSdkInstall" am: 19afb3c0c3 am: 1553539301
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625381

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia24a47ac0f70e1a99fe2d0cf1ca72db98fbbb9fd
2021-03-10 20:13:23 +00:00
Colin Cross d475665a61 Merge changes from topic "lint_rbe" am: 068f33f6cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621780

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f00672cd11d70f34cf283378c907a8b168715dc
2021-03-10 20:13:18 +00:00
Paul Duffin b5424164d9 Merge "Extract sdk registration code into function for reuse" am: 8bee400a74 am: df21923819
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625380

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74690de8389476de26f61450b0a6394303f32bd0
2021-03-10 20:13:17 +00:00
Paul Duffin 0f9e7887fa Merge "Extract apex registration code into function for reuse" am: 3d3f7a0c3f am: 5dccf644f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c20a0a5a5fed0aae8cdbdb678f09474e09d8324
2021-03-10 20:12:30 +00:00
Paul Duffin 3b2636fdf3 Merge "Remove duplicate sdk.TestHelper" 2021-03-10 19:59:56 +00:00
Jaewoong Jung 75c7cead62 Delete defaultsFactory in java.go.
The factory function became obsolete a long time ago. The module
description text will be correctly extracted with this change.

Test: TreeHugger
Change-Id: If4eb936d34e5a71e6f298f53827a887f34af7cae
2021-03-10 11:41:50 -08:00
sophiez fdfe8f74fd Fix getting list of module libraries in builder.go
Replace f.stem to f.Stem() method otherwise empty libNames get passed
in.

Fixes:181991887

Test: DIST_DIR=~/my_dist_dir TARGET_BUILD_VARIANT=userdebug PRODUCT=mainline_modules_x86 ./vendor/google/build/build_unbundled_coverage_mainline_module.sh -j80

Change-Id: I3384f3a73c5637928584b9d87b2f936116a8f15e
Merged-In: Ie1799c0972d63da823ad375f008018de782529d1
2021-03-10 19:27:54 +00:00
Chris Parsons 808d84c45d mixed builds for cc_static_library without deps
Test: Manual mixed builds testing of `libc` target with manually
migrated "libc_nopthread" and "libc_init_dynamic".

Change-Id: If7d67e95eca9899271b1eeb662c7c2e571f64afa
2021-03-10 13:24:59 -05:00
Colin Cross 068f33f6cf Merge changes from topic "lint_rbe"
* changes:
  Pass ANDROID_SDK_HOME to metalava so it doesn't write to ~/.android
  Support remoting lint commands with RBE
2021-03-10 18:13:31 +00:00
Paul Duffin 1553539301 Merge "Simplify TestSdkInstall" am: 19afb3c0c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625381

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb646e8717895d267f045b35a5159086e6998cf3
2021-03-10 18:12:27 +00:00
Paul Duffin df21923819 Merge "Extract sdk registration code into function for reuse" am: 8bee400a74
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625380

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd537ed56acb0df6b7e4e27594cfbfb575db0d23
2021-03-10 18:12:19 +00:00
Colin Cross ad22bc2995 Add comment to lintPaths
Test: none
Change-Id: Ia7db6e27fedd95df2ebfc573e35a44a93acb031b
2021-03-10 10:10:40 -08:00
Paul Duffin 5dccf644f1 Merge "Extract apex registration code into function for reuse" am: 3d3f7a0c3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5099d0a7f2079cc6118a6cbbb8a99a73c209587
2021-03-10 18:10:15 +00:00
Paul Duffin 19afb3c0c3 Merge "Simplify TestSdkInstall" 2021-03-10 17:31:41 +00:00
Paul Duffin 8bee400a74 Merge "Extract sdk registration code into function for reuse" 2021-03-10 17:31:26 +00:00
Paul Duffin 3d3f7a0c3f Merge "Extract apex registration code into function for reuse" 2021-03-10 17:31:13 +00:00
Paul Duffin e9612824ea Avoid calling DepIsInSameApex when excluded from apex contents
While debugging an issue with some work I was doing on boot image
modules I noticed that markPlatformAvailability() is calling
DepIsInSameApex() even when the dependency tag indicates that it is
excluded from the apex contents.

Test: m droid
Change-Id: Iac49049546a886f7a3a0d9640ffd31ce24c61364
2021-03-10 16:44:57 +00:00
Lukacs T. Berki b4ced9d886 Fix the environment of soong_build:
- Incorporate BAZEL_* variables in soong.environment.available
- Set SOONG_DELVE when requested

Test: Manual.
Change-Id: I3ac675f4876220b788cc48d288b402ac6016c37b
2021-03-10 15:43:06 +01:00
Aaron Huang 0a19d6389a Add service-connectivity-pre-jarjar to legacy core platform list
This is a library pre jarjar version which still has dependencies
on legacy core platform APIs and this library will be inculded in
service-connectivity. Thus, this change replaces service-connectivity
with service-connectivity-pre-jarjar.

Bug: 177046265
Test: build pass
Change-Id: I1a84ff07318da03f368cbccb25b6cabebb2de403
Merged-In: I1a84ff07318da03f368cbccb25b6cabebb2de403
2021-03-10 22:29:52 +08:00
Paul Duffin a3cb2b396f Remove duplicate sdk.TestHelper
As part of the work on the new fixture mechanism some of the TestHelper
functionality was moved into the android/fixture.go package. This moves
the rest and removes the now duplicated TestHelper from the sdk
package.

Also removed some unnecessary & operators.

Bug: 181070625
Test: m nothing
Change-Id: Ia09a5d05e4fab3a4e28cf44b2d947a33541e3925
2021-03-10 14:07:20 +00:00
Paul Duffin 923d2112c8 Merge "Rename SetErrorHandler to ExtendWithErrorHandler" am: 282671d696 am: ef8f637b5a am: deb61e6e1e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1623768

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3133c6df491f7bdf8aca1a0b1600c4bd07a82512
2021-03-10 13:30:02 +00:00
TreeHugger Robot 0ae9847061 [automerger skipped] Merge "update apex/allowed_deps.txt" into rvc-qpr-dev-plus-aosp am: b796d5ea56 -s ours
am skip reason: Change-Id I0ea6b33c2d27081a5f0622edb0f5df4088a71455 with SHA-1 c38777cb75 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifebdf435a4419c24a40f2742b56305da9d5e262d
2021-03-10 13:29:45 +00:00
Paul Duffin deb61e6e1e Merge "Rename SetErrorHandler to ExtendWithErrorHandler" am: 282671d696 am: ef8f637b5a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1623768

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19e659d14f891f0e98d45aca899f9bed7b349cac
2021-03-10 13:25:28 +00:00
Paul Duffin 043f5e7881 Treat core_platform as stable unless module uses legacy
The sdk_version: "core_platform" refers to the stable core platform
unless the module is in the exception list. This change makes sure that
CheckStableSdkVersion() reflects that behavior.

Bug: 180399951
Test: m nothing
Change-Id: Ia0b1e13322352b87f5a3c6621e37f23ba637ffb6
2021-03-10 13:04:03 +00:00
TreeHugger Robot b796d5ea56 Merge "update apex/allowed_deps.txt" into rvc-qpr-dev-plus-aosp 2021-03-10 12:47:06 +00:00
Paul Duffin ef8f637b5a Merge "Rename SetErrorHandler to ExtendWithErrorHandler" am: 282671d696
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1623768

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I620584e54bc752f50524889d0bdd269cbe1b0601
2021-03-10 12:30:23 +00:00
Lukács T. Berki 89b647fe6a Merge "Make $PATH available when building soong_build." am: 5ce36b4a96 am: 0029271ec2 am: d59e8aaceb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfef5afe4bf021af9c47ef0a8bccaa239d3e73ce
2021-03-10 11:51:39 +00:00
Paul Duffin 282671d696 Merge "Rename SetErrorHandler to ExtendWithErrorHandler" 2021-03-10 11:51:29 +00:00
Nicolas Geoffray 03eac0ffe1 [automerger skipped] Merge "Reinstate the enforcement of stable core platform API usage" am: a0acfa8b85 -s ours am: bfba89717e -s ours am: a35956cf8c -s ours
am skip reason: Change-Id I15e5a6c2f07e73718803501d705de0d7ab9bec90 with SHA-1 c0f4373106 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69db8f9df75804d50cf8c98dcc6065f15e0a4553
2021-03-10 11:51:28 +00:00
Lukács T. Berki d59e8aaceb Merge "Make $PATH available when building soong_build." am: 5ce36b4a96 am: 0029271ec2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If60f3de615d289a18ad6051fb50e60719643cd33
2021-03-10 11:01:04 +00:00
Nicolas Geoffray a35956cf8c [automerger skipped] Merge "Reinstate the enforcement of stable core platform API usage" am: a0acfa8b85 -s ours am: bfba89717e -s ours
am skip reason: Change-Id I15e5a6c2f07e73718803501d705de0d7ab9bec90 with SHA-1 84c3807b99 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a030fc903c35b609d944a5e822ef06d500cdc81
2021-03-10 11:00:46 +00:00
Lukács T. Berki 0029271ec2 Merge "Make $PATH available when building soong_build." am: 5ce36b4a96
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7665fd4daa73f4ef99df4170110c2b52d44ee98f
2021-03-10 10:23:05 +00:00