tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
57968 commits 1 branch 0 tags 115 MiB
Commit graph

4590 commits

Author SHA1 Message Date
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
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
Cole Faust
7071a05c93 bp2build support for .asm files 
Bug: 233948256
Test: ./build/bazel/ci/bp2build.sh
Change-Id: I387c2aeb36df004f0e1838a08a4f28b38503d6ed
 2022-08-03 13:34:15 -07:00
Sam Delmerico
6f510d5397 Merge "add java_import to mixed build" am: c31778ffbc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1999612

Change-Id: Iae2319f0262d20c59ce977e793bf9a6d2556eec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-03 17:49:12 +00:00
Sasha Smundak
a095406411 Consolidate Bazel conversion state into a single field in CommonProperties 
Bazel conversion state needs to be cloned during module cloning, so it
should be registered via module.AddProperties. Until now it was done
implicitly as the modules converted so far added the whole
base.commonProperties field (and thus transitively all its subfields).
However, adding CommonProperties also adds its fields to the list of
the module's attributes, which is undesirable. The problem surfaced
while implementing Bazel conversion to the `license` rule.

Bug: 190817312
Test: treehugger
Change-Id: Id3de4ede8df81b21f00065a3a1bdc2d707391c3a
 2022-08-03 10:46:19 -07:00
Sam Delmerico
c31778ffbc Merge "add java_import to mixed build" 2022-08-03 17:13:06 +00:00
Jooyung Han
39cadf9f06 Allow libwifi-hal to use makefile_goal 
To migrate libwifi-hal from make to soong, its dependencis
(libwifi-hal-<vendor>) are wrapped in makefile_goal until they are
migrated to soong as well.

Bug: 239984067
Test: m
Merged-In: Icb09ef1bf40311498db04b7358634eadd0fed5fa
Change-Id: Icb09ef1bf40311498db04b7358634eadd0fed5fa
(cherry picked from commit f9392095d7e6f065310ab7662bb34897295f7d9f)
 2022-08-03 17:47:25 +09:00
Mu-Le Lee
b273f88b54 Merge "Diff source dump and current version dump for Cross-Version ABI Check" am: 950f28abe2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2166882

Change-Id: Iaff3116cf86d46f517e1c067dea0ef667c66ea0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-03 04:13:16 +00:00
Mu-Le Lee
950f28abe2 Merge "Diff source dump and current version dump for Cross-Version ABI Check" 2022-08-03 03:52:38 +00:00
Usta Shrestha
575d034228 Merge "Cosmetic Changes plus log errors" am: b7e4b08e46 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2171706

Change-Id: I8abf353ae5d5144df9432e604c033bf44950ea6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 22:22:46 +00:00
Usta Shrestha
b7e4b08e46 Merge "Cosmetic Changes plus log errors" 2022-08-02 21:33:51 +00:00
Usta Shrestha
db46a9bbb8 Cosmetic Changes plus log errors 
Test: N/A
Bug: N/A
Change-Id: I39e622a93270c922bdbea27ca79632a606431a2c
 2022-08-02 20:24:57 +00:00
Treehugger Robot
9762f83951 Merge "Don't write bogus built targets." am: 769414a169 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2170523

Change-Id: I7b6c62170969ee1955844aac778d604ce2f14be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 17:47:13 +00:00
Treehugger Robot
69d63d0bd8 Merge "Filter defaults from license metadata dependencies." am: a070baad71 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2170522

Change-Id: I4a6074f0ff691bfd0ce9f77cad12123a618e6db9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 17:46:54 +00:00
Treehugger Robot
13d06a134f Merge "Remove obsolete notice property." am: 0ea404eb36 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2156349

Change-Id: Ib08598705dbf4904d50f18b1b1c5c206557cf197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 17:46:17 +00:00
Mu-Le Lee
5e04753bb6 Diff source dump and current version dump for Cross-Version ABI Check 
In the newly proposed Cross-Verison ABI Check, the path of dump that
LLNDK, NDK and mainline reference to is changed to:
Before finalization: current/
After finalization: {PLATFORM_SDK_VERSION}/
In addition, a related CL(aosp/2147882) modifies the script to create
dump to folders that match the current finalization stage.

Test: make libbinder_ndk
Bug: 238387082
Change-Id: I92a4a52c26c85cf4c866b441e54291c6a624fbf4
 2022-08-02 17:35:15 +00:00
Treehugger Robot
769414a169 Merge "Don't write bogus built targets." 2022-08-02 17:25:58 +00:00
Treehugger Robot
a070baad71 Merge "Filter defaults from license metadata dependencies." 2022-08-02 17:23:22 +00:00
Treehugger Robot
0ea404eb36 Merge "Remove obsolete notice property." 2022-08-02 17:22:42 +00:00
Alexei Nicoara
18ecb86247 Merge "Moving default version outside of apex package" am: 21b027dca8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167105

Change-Id: I92100d519f4744678a4c1082c460daddc085cb56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 09:18:23 +00:00
Alexei Nicoara
7579b67ef9 Moving default version outside of apex package 
The default version needs to be used by both apex and apk updatable
modules. Moving it to android package so it can be accessed without
circular dependencies.

Test: presubmit
Bug: 231691162

Change-Id: Icafd50d0b065e89a115ae9c9b6ea55adf2730b49
Merged-In: Icafd50d0b065e89a115ae9c9b6ea55adf2730b49
 2022-08-01 16:28:48 +01:00
Treehugger Robot
953254b150 Merge "Implement mixed builds for apex modules, take 2." am: 88e7512572 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167802

Change-Id: I9efd3c2e6f8c93aa8d1add3cbe6802e24d73b084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 23:06:00 +00:00
Bob Badour
5282f6d2f1 Don't write bogus built targets. 
Bug: 239638693

Test: m droid dist
Change-Id: I1a5bc587afc2ac4835bed929d79b4bf28d7d6a6d
 2022-07-29 15:49:58 -07:00
Treehugger Robot
88e7512572 Merge "Implement mixed builds for apex modules, take 2." 2022-07-29 22:43:19 +00:00
Alix Espino
ce91531649 Merge "Implement bp2build for linker_config" am: 2f384a7432 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2115194

Change-Id: Ia56cfb86085ec45fd54bbfa2b2ab82d72ed1d940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 18:49:21 +00:00
Alix Espino
2f384a7432 Merge "Implement bp2build for linker_config" 2022-07-29 18:19:00 +00:00
Bob Badour
7fd521e62e Filter defaults from license metadata dependencies. 
Bug: 239638693

Test: m droid dist
Change-Id: Ic094aa706145ddd1cb8a1b134117c83ad41061b7
 2022-07-29 11:18:12 -07:00
Bob Badour
0cc5facf79 Remove obsolete notice property. 
Bug: 192434786

Test: m droid dist

Change-Id: I0f384ae895cebab9732448b82db600c67eb8f711
 2022-07-29 17:54:40 +00:00
Sasha Smundak
fe9a5b833d Implement mixed builds for apex modules, take 2. 
* Add ApexCqueryInfo to obtain apex artifacts used by the makefile
  generator and downstream modules
* Refactor code common to GenerateAndroidBuildActions and ProcessBazelQueryResponse
* Implement android.MixedBuildBuildable for modules
* Enable mixed build for apex modules with payload_type:"image"

The first take 6a2b7c40b was setting compressed APEX suffix incorrectly, and
was reverted in 8a3c91494.

Fixes: 239925080 239695521 232085015
Test: treehugger
Change-Id: I1720f8db3c7cc773183d25a815d9b7eeaf7c73ad
 2022-07-28 14:43:50 -07:00
Sam Delmerico
277795cb4f add java_import to mixed build 
Bug: 220168131
Test: go test ./java -run TestImportMixedBuild
Test: USE_BAZEL_ANALYSIS=1 m CtsManagedProfileApp && verify jars are
  included from execroot/__main__ directory
Test: build/bazel/ci/mixed_droid.sh
Change-Id: I6d35a2389ea35525d532efc8474c71d2c8825646
 2022-07-26 17:14:42 -04:00
Martin Stjernholm
2fb081fd28 Merge "Revert "Implement mixed builds for apex modules."" am: 0bb7f0494e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2165026

Change-Id: I375077ee73ba18308d0841ca76956757935dd992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 14:08:18 +00:00
Martin Stjernholm
0bb7f0494e Merge "Revert "Implement mixed builds for apex modules."" 2022-07-26 13:52:18 +00:00
Martin Stjernholm
8a3c914942 Revert "Implement mixed builds for apex modules." 
Revert submission 2147387-mixed_builds

Reason for revert: Breaks zipapex build on git_master-art-host
Bug: 239925080
Reverted Changes:
I9f1e03e5e:Implement mixed builds for apex modules.
I13d9a0270:Add container and bundle encription key pairs to t...

Change-Id: I0eaad4dd81cac16d634f4c9cec18137a38e30d47
 2022-07-26 09:35:39 +00:00
Joe Onorato
8e269418c2 Merge "Add top level and per-mutator traces to soong_build" am: b7873a8b0f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2119953

Change-Id: I1eac9397bb99df6b666ed872d4a4256188190544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 20:00:02 +00:00
Joe Onorato
b7873a8b0f Merge "Add top level and per-mutator traces to soong_build" 2022-07-22 19:28:53 +00:00