StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,508 Commits 1 Branch 0 Tags
684f63ab5ab0dc7680c901b9a761a21f36df9941
Commit Graph

5034 Commits

Author SHA1 Message Date
Vinh Tran
444154d5d3 Convert filegroup with AIDL srcs to aidl_library 
Change-Id: I94c185744a86c812dc48e30b66e060361b9161cb
Test: USE_BAZEL_ANALYSIS=1 m libbinder
Test: USE_BAZEL_ANALYSIS=1 m module-lib-api-stubs-docs-non-updatable
Bug: 243010121
 2022-08-18 14:01:15 -04:00
Vinh Tran
16fe8e1cf1 Fix ProcessBazelQueryResponse of filegroup 
In mixed builds currently, filegroup doesn't use path prop when creating the paths to the srcs. It defaults to ModuleDir.

Hence, when java.genAidlIncludeFlags [1] calls srcFile.Rel() to eventually create the AIDL include dir for AIDL flags, srcFile.Rel() returns the filepath relative to the module directory instead. This CL appends path prop to module dir when creating relativeRoot.

This fixes the bridge between converted filegroup that set path prop (e.g. libbinder_aidl) to unconverted module (for example, droidstubs). The fix is needed for the child CL aosp/2186599 to convert libbinder_aidl to Bazel. Without this fix, module-lib-api-stubs-docs-non-updatable (unconverted module that depends on libbinder_aidl) can't be built in mixed builds.

[1]: https://cs.android.com/android/platform/superproject/+/master:build/soong/java/gen.go;l=123?q=java%2Fgen.go

Test: go test
Bug: 243010121
Change-Id: Ic2dd2ab9199c62010303a5b8c611d722f4a4118d
 2022-08-18 13:59:06 -04:00
Cole Faust
6b29f593ea Bp2build support for runtime_libs 
Bug: 213201180
Test: Updated the minimal apex in the build/bazel cl to include runtime_libs so the apex diff test will test it
Change-Id: I10add1895cfa122a370d24196a33ec2dcfafccfc
 2022-08-17 15:20:17 -07:00
Colin Cross
d079e0b270 Reformat build/soong for go 1.19 
Test: none
Change-Id: I132368f0fcbdb5ea088b5b84dbe4ccfdd9e94cad
 2022-08-17 10:43:13 -07:00
Zhenhuang Wang
852d0c4859 Merge "Move common test_options properties into the android package" 2022-08-17 15:22:18 +00:00
Jingwen Chen
b2f584ba58 bp2build: allowlist frameworks/av/media/liberror/... and denylist broken targets. 
New target from AOSP 13 drop.

Test: bp2build.sh
Change-Id: Ica819c5c5c42b52ce11514f146e09065f9690e9b
 2022-08-17 10:51:27 +00:00
Xin Li
6ef4fae229 Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:08:20 +00:00
Zhenhuang Wang
0ac5a431a9 Move common test_options properties into the android package 
Multiple modules (e.g. java, cc, python, rust) define the `test_options`
field. Extract the common properties in test_options to share across
different test rules.

Bug: 240928948
Test: `refreshmod` and diff with original module-info.json
Change-Id: I404a7a157b4ccaa53d800ee2217559ff695bd825
 2022-08-17 01:19:15 +08: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
Sam Delmerico
02626f9365 add bazel AIDL examples to bp2build 
Bug: 229251008
Test: b build //build/bazel/examples/aidl:example-aidl-test
Change-Id: I91ac8562c431bdb0378068695d8acd4a8c65d57f
 2022-08-15 15:49:00 -04: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