Commit Graph

4626 Commits

Author SHA1 Message Date
William Escande
2ad6e84d60 Bluetooth available hack
The first hack has been introduced to facilitate the creation of the
com.android.btservices apex without the need to upload 100+ cl close to
the release date.
We now want to delete com.android.bluetooth apex and replace all the
apex_available rules to target the new apex name
It will be way much easier to do this in separate CL and without forcing
us into a single topic.

Bug: 243054261
Test: Build
Change-Id: Ia03698db839db4684871eb38c088f88d6bdcba4b
2022-08-18 13:34:22 -07:00
Xin Li
6ef4fae229 Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:08:20 +00:00
Yu Liu
ae7fe1697c Merge "Re-enable the base hidl modules in mixed build." 2022-08-16 17:15:31 +00:00
Treehugger Robot
6b56c375a1 Merge "CpExecutable should not preserve symlink" am: 90fbcf1c29
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2182362

Change-Id: I70637ef2695cadd5faad9ccb04e570d905896c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 03:22:02 +00:00
Chih-Hung Hsieh
1048a73f21 CpExecutable should not preserve symlink
* When copy to an $out file, a symlink can become a dangling link.
* The following chmod +x will fail with a dangling link.

Bug: 241815504
Test: presubmit builds
Change-Id: Ic3dd9d41376a94381981fb973b41a1650f5ac946
2022-08-16 01:03:10 +00:00
Yu Liu
6175e15807 Re-enable the base hidl modules in mixed build.
b/242220039 is resolved.

Bug: 232520859
Test: Run mixed_droid locally,
Change-Id: I63462bd1bb763eefec4c1665514b38c32bdd80a5
2022-08-15 21:29:57 +00:00
Treehugger Robot
938a51225c Merge "Move bp2build progress proto to soong." am: c2cb917659
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2185656

Change-Id: Ie4881ba06b4beed56935e09817f9c6d882fb31e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 16:49:03 +00:00
Treehugger Robot
c2cb917659 Merge "Move bp2build progress proto to soong." 2022-08-15 16:43:35 +00:00
Treehugger Robot
a84b1b6815 Merge "Add mainline dev certificate dir to config" am: e0ac9f74a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2185477

Change-Id: I0014fd54a432a0a8054c953711ac5fadf54fdd54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 11:25:19 +00:00
Treehugger Robot
e0ac9f74a6 Merge "Add mainline dev certificate dir to config" 2022-08-15 11:04:14 +00:00
Christopher Parsons
e8225a6dde Merge "Write cquery.out even without error" am: d00b562939
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2183876

Change-Id: I9973b4c4bd79bd5c02c99da0665da6301ac24793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 22:54:22 +00:00
Christopher Parsons
d00b562939 Merge "Write cquery.out even without error" 2022-08-12 22:33:37 +00:00
Yu Liu
72f3ff39ec Merge "Disable the base hidl modules in mixed build." am: fa044e79dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2185715

Change-Id: I13be84e7f8853635b7074ad43671791703bb03c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 21:37:42 +00:00
Yu Liu
fa044e79dd Merge "Disable the base hidl modules in mixed build." 2022-08-12 21:15:50 +00:00
Liz Kammer
38eba9d2e4 Merge changes I8a99e3d2,I717d7f5e am: 5480f9414a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2171703

Change-Id: I6369acdc49dd6098124a28381fd9323b1be1de3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 21:02:20 +00:00
Liz Kammer
5480f9414a Merge changes I8a99e3d2,I717d7f5e
* changes:
  Remove unused bp2build logic from arch.go
  Split up config.go
2022-08-12 20:39:59 +00:00
Liz Kammer
15088e45a9 Move bp2build progress proto to soong.
This allows us to reuse existing infra to export to internal.

Test: b build //build/bazel/scripts/bp2build-progress:bp2build-progress
Change-Id: If4888f8f59d56ddf4e98bdb8456ca69ff7f78a49
2022-08-12 16:38:38 -04:00
Treehugger Robot
12b5907866 Merge "Move mixed builds request queuing to final deps" am: 9acc4d57ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2172271

Change-Id: I9d52719265c52d23782b5005e42c7c2e6fc039c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 20:08:24 +00:00
Treehugger Robot
9acc4d57ea Merge "Move mixed builds request queuing to final deps" 2022-08-12 19:41:43 +00:00
Yu Liu
a67335be88 Disable the base hidl modules in mixed build.
Will enable again once b/242220039 is resolved.

Bug: 232520859
Test: Run mixed_droid locally,
Change-Id: I6004fcbf14ba0669a5b9205fec0019f38cf7bd39
2022-08-12 17:40:42 +00:00
Chris Parsons
429f540bd0 Write cquery.out even without error
This was accidentally suppressed in aosp/2124255, so this reverts that
bug.

Test: USE_BAZEL_ANALYSIS=1 m nothing && ls out/soong/soong_injection/cquery.out
Change-Id: I5331526a766100bb399aac93238919abd1ff5ca2
2022-08-12 10:16:27 -04:00
Inseob Kim
80fa79830d Add mainline dev certificate dir to config
Bug: 33691272
Test: build
Change-Id: I22aa2f016042eed8555c66a19caeb8967416484d
2022-08-12 21:36:25 +09:00
Yu Liu
e1eada0b77 Merge "Support bp2build conversion of hidl_interface." am: 4b32269d0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2137952

Change-Id: I62a5d52b8de273fa3cb92cd3910d41964c47aa99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 18:21:57 +00:00
Yu Liu
df4413a01f Support bp2build conversion of hidl_interface.
Bug: 232520859
Test: Manual tests
Change-Id: I0a16f3c0a953dbc58c196aa9d2fedd2063c2a875
2022-08-10 10:06:04 -07:00
Romain Jobredeaux
2773d751ff Merge "Space out the bp2build allowlist for easier merging." am: 136c0d110d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168382

Change-Id: I096671588a6fae6183cc172cea6877adaa8a8290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 14:39:56 +00:00
Romain Jobredeaux
136c0d110d Merge "Space out the bp2build allowlist for easier merging." 2022-08-10 14:20:10 +00:00
Treehugger Robot
e6fb48270c Merge "Add libapexutil to denylist" am: 8c9a3f2596
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2179776

Change-Id: Ieab95664fed76bbe30e927385a4aca642d36e9b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 21:07:39 +00:00
Treehugger Robot
8c9a3f2596 Merge "Add libapexutil to denylist" 2022-08-09 20:36:26 +00:00
Romain Jobredeaux
5a634d3364 Space out the bp2build allowlist for easier merging.
Test: b build packages/apps/Music
Change-Id: Icd762dc26932d3ea58234e474c46f7fb66c9967c
2022-08-09 14:51:36 -04:00
Romain Jobredeaux
20f7fbc61e Merge "Bp2Build converter for android_library_import and android_library." am: aaf4f5ec8a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2165698

Change-Id: I7b1a2b36507a3354bbe35769fdfebfdeb859066a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 18:14:50 +00:00
Romain Jobredeaux
aaf4f5ec8a Merge "Bp2Build converter for android_library_import and android_library." 2022-08-09 17:46:59 +00:00
Liz Kammer
6a824f6027 Add libapexutil to denylist
Depends on unconverted module apex-info-list-tinyxml

Test: ci
Test: b build //system/...
Change-Id: I56cba9aa193d7285d49a3fba92b07bb92241aad0
2022-08-09 13:26:23 -04:00
Liz Kammer
2afec9aa1d Denylist test_fips because it depends on adb am: 3d13adc9d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2179775

Change-Id: If18bf2957bb81e7b373f1ba8d6461b4ad853eb6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 15:47:25 +00:00
Liz Kammer
3d13adc9d1 Denylist test_fips because it depends on adb
Test: CI
Test: b build //external/boringssl/...
Change-Id: I278b8229cea347acef2edd9e56e2f0853f7780e0
2022-08-09 09:26:54 -04:00
Romain Jobredeaux
c9b2bba3cd Bp2Build converter for android_library_import and android_library.
Minor refactor of android_app converted to account for common attributes
between library and app.

Test: go test
Test: ../bazel/ci/bp2build.sh
Change-Id: I60b06eef6d2b9bc2d91f8b83522747ebbe76bbb6
Bug: 215230093
Bug: 215230095
2022-08-08 11:23:02 -04:00
Treehugger Robot
45cbeb28ff Merge "Clean up android/module.go" am: 8e77db3b36
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2175946

Change-Id: Ib8d11d3057a0b184fbe04920d5abb0ac683fd84d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:59:33 +00:00
Treehugger Robot
8e77db3b36 Merge "Clean up android/module.go" 2022-08-08 11:43:36 +00:00
Treehugger Robot
e6f2bd54e1 Merge changes I70159a49,I1809c0fc am: bfe0342e73
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2175583

Change-Id: I666fb2657f4015e5acc80eaf66285a1fb822775d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-06 07:43:17 +00:00
Treehugger Robot
bfe0342e73 Merge changes I70159a49,I1809c0fc
* changes:
  bp2build: Allowlist and build fastboot with Bazel.
  bp2build: Allowlist //external/toybox.
2022-08-06 07:14:13 +00:00
Treehugger Robot
920fbac11a Merge "Fix invalid json when product variables have quotes" am: ab8581a1f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2175955

Change-Id: Icca744c4a87625cbe7b03db9ee3b29efaf1acd26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 19:58:53 +00:00
Treehugger Robot
ab8581a1f8 Merge "Fix invalid json when product variables have quotes" 2022-08-05 19:20:12 +00:00
Cole Faust
082c5f31cc Fix invalid json when product variables have quotes
Go's json encoder will escape quotes with backslashes.
But we put the encoded json into a Starlark string
literal, which will evaluate the \" into just a regular
quote, so they won't be escaped when the json.parse()
gets to them.

Escape all backslashes so this doesn't happen.

Test: lunch sdk_phone_x86_64-userdebug; b build //build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal
Change-Id: I473e6c42968fcf73d47dec61670956a7ac9a6c88
2022-08-04 15:51:58 -07:00
Sasha Smundak
e198eafaf6 Clean up android/module.go
Test: treehugger
Change-Id: I41973dfc6805009d44323f3f1a89f923abf39c79
2022-08-04 15:49:11 -07:00
Jingwen Chen
9009dc2d8f bp2build: Allowlist and build fastboot with Bazel.
Test: $ b build //system/core/fastboot:fastboot --config=linux_x86_64 &&
bazel-bin/system/core/fastboot/fastboot --help

Change-Id: I70159a49e7fdfbb8a0b653161e9ea2a9eeeab977
2022-08-04 15:26:46 +00:00
Jingwen Chen
5012e07bae bp2build: Allowlist //external/toybox.
Test: $ b build //external/toybox:toybox --config=linux_x86_64 && bazel-bin/external/toybox/toybox ls
Change-Id: I1809c0fcc3ae4a1965ee4bff0653266f9f64f23f
2022-08-04 15:04:43 +00:00
Alexander Smundak
d3252715f2 Merge changes Id3de4ede,Iae326016 am: fe57ecfdef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2172556

Change-Id: I06844917d9ee27bbb3f5ab85d976c5231f6ff695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 03:01:53 +00:00
Alexander Smundak
fe57ecfdef Merge changes Id3de4ede,Iae326016
* changes:
  Consolidate Bazel conversion state into a single field in CommonProperties
  Index Go code in the build/make/tools
2022-08-04 02:34:17 +00:00
Jooyung Han
6aa81788ed Merge "Allow libwifi-hal to use makefile_goal" am: 113bd15013
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2173922

Change-Id: If1ccffe673894eee39ee368345ce068173c39f33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 23:02:38 +00:00
Jooyung Han
113bd15013 Merge "Allow libwifi-hal to use makefile_goal" 2022-08-03 22:40:43 +00:00
Cole Faust
e1022f53bc bp2build support for .asm files am: 7071a05c93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168429

Change-Id: Id6241afd422f733d33cafc4208088c353f5e58d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 22:20:25 +00:00