Commit Graph

48944 Commits

Author SHA1 Message Date
Martin Stjernholm
67cbe36b4a Merge "Do not allow duplicate deapexer dependencies." am: d7c3fc0ae0 am: 49df6778ca am: 6bec093e48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1752641

Change-Id: I079dd1a7666520e69f47b7819ee6977ba6e770fe
2021-12-13 16:51:07 +00:00
Martin Stjernholm
6bec093e48 Merge "Do not allow duplicate deapexer dependencies." am: d7c3fc0ae0 am: 49df6778ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1752641

Change-Id: I2fae5dc391c4996ac7a8700bd1d62a529ff7dad8
2021-12-13 16:30:54 +00: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
efd0e0c7ee Add initial support for use_version_lib. am: 484aa25875 am: afbbd4316d am: 2b6dca1b8c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918278

Change-Id: I5dfe6e323fce314178e918047a05c77cffc916ab
2021-12-13 14:24:12 +00:00
Rupert Shuttleworth
2b6dca1b8c Add initial support for use_version_lib. am: 484aa25875 am: afbbd4316d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918278

Change-Id: I1c36dbdea7d26ad230b0cb88321f8df8da95a345
2021-12-13 14:06:53 +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
825f5eb8a9 Merge "bp2build: Fix apex.binaries to be a LabelListAttribute." am: 8d0bd355fd am: d6b0aab0cd am: ed10ce524f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913474

Change-Id: Id5a70bc05cbf3a70a98395d3029707076715a021
2021-12-13 11:02:24 +00:00
Jingwen Chen
ed10ce524f Merge "bp2build: Fix apex.binaries to be a LabelListAttribute." am: 8d0bd355fd am: d6b0aab0cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913474

Change-Id: Ie7269e2f7c2e3dd0254b3b34917fe283ac817d99
2021-12-13 10:40:24 +00: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
cba04e24bc Merge "Suppress all progress messages from Ninja if ANDROID_QUIET_BUILD is set." am: 789e5026b4 am: f0e94114d7 am: 86df52e4a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895824

Change-Id: Ie5556b800a074ce8791b60bd10f82622a5be70ed
2021-12-12 23:29:36 +00:00
Alexander Smundak
86df52e4a4 Merge "Suppress all progress messages from Ninja if ANDROID_QUIET_BUILD is set." am: 789e5026b4 am: f0e94114d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895824

Change-Id: I7617fedbfc07bfb0efb1e55363997a27a7540a45
2021-12-12 23:04:59 +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
1fcba64203 Merge changes from topic "revert-1918946-revert-1899703-AMWIVCREEV-CCTEXIRRRV" am: f4c2bf6559 am: 45b20269f6 am: 4eb4bc649d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918949

Change-Id: If65224033557c26a714052d388f790628a372ed7
2021-12-11 04:32:42 +00:00
Colin Cross
f3a84bc1a6 Revert^2 "Build license metadata files in Soong" am: 4acaea9cbf am: d8395b1b2f am: c6d7cae3ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918948

Change-Id: Id80b8181716cc7b5da0100fd29e9ebd865ff43d1
2021-12-11 04:32:39 +00:00
Treehugger Robot
4eb4bc649d Merge changes from topic "revert-1918946-revert-1899703-AMWIVCREEV-CCTEXIRRRV" am: f4c2bf6559 am: 45b20269f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918949

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

Change-Id: Ie510cb452eaf9db2e2b00914d1d06d8a445aacbd
2021-12-11 04:04:21 +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
9d9dc0a0a4 Merge changes from topic "revert-1899703-AMWIVCREEV" am: 67938c2925 am: 34ca826598 am: 5400ba36b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918944

Change-Id: Ief89219f9cff1d842205febae3a43b607c22ba7a
2021-12-10 23:54:52 +00:00
Colin Cross
8110688fe1 Revert "Add dependency license annotations" am: abe2a4b7bf am: a7fcadce74 am: 265eec85a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918943

Change-Id: I84dc971ed6788c3e62eb4a297d95483ed75031c0
2021-12-10 23:54:50 +00:00
Colin Cross
5400ba36b5 Merge changes from topic "revert-1899703-AMWIVCREEV" am: 67938c2925 am: 34ca826598
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918944

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

Change-Id: I48b4bdbcae5cf55b2c7323187e5698a327bb4bd6
2021-12-10 23:39:21 +00: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
7d162acb13 Merge changes from topic "soong-license-metadata" am: b435744fdc am: 9a6e17e5c1 am: 1aa0005a1f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899703

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

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

Change-Id: If504de76766aad0e13eafee6342567ad39e22d55
2021-12-10 22:42:17 +00:00
Colin Cross
1aa0005a1f Merge changes from topic "soong-license-metadata" am: b435744fdc am: 9a6e17e5c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899703

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

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

Change-Id: I54f79d0eba2d1e54f1346199789c8c1f1fc5ba58
2021-12-10 22:20:38 +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
Sorin Basca
73b1de9cd2 Merge "Adding experimental option to target Java 11" am: eb59a6d3ea am: 2aabb8de52 am: c6a840e45d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1904231

Change-Id: I4e9f4476487af326b7f392be62a0d35ab2318a06
2021-12-10 14:57:50 +00:00
Sorin Basca
c6a840e45d Merge "Adding experimental option to target Java 11" am: eb59a6d3ea am: 2aabb8de52
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1904231

Change-Id: Ifda6562f4b8ea922f2bb64e739e03ad3a023166d
2021-12-10 14:44:04 +00: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
d788455703 Merge "Add BoardPlatVendorPolicy to soong config" am: fcaea66933 am: 8bc61f24aa am: 656ba20a64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913480

Change-Id: I820344c7b60a61924324c64e8ac4169a44a0c779
2021-12-10 13:03:08 +00:00