Commit graph

4697 commits

Author SHA1 Message Date
Treehugger Robot
4673d18144 Merge "disable kotlin java_imports for mixed builds" 2022-08-23 21:28:07 +00:00
Sam Delmerico
0b66fb28e6 disable kotlin java_imports for mixed builds
These Kotlin JARs contain class files under the META-INF directory that
are incorrectly parsed in gen_jarjar.py causing the Jarjar tool to error.

Bug: 243098369
Bug: 217750501
Test: build/bazel/ci/mixed_droid.sh
Change-Id: I62aaf086dc91d868a8d653f7fdb2c111bdc96097
2022-08-23 15:27:56 -04:00
Christopher Parsons
5a2a4814af Merge "Refactor mixed build allowlist handling" 2022-08-23 17:21:16 +00:00
Chris Parsons
ad876010fe Refactor mixed build allowlist handling
This refactoring prepares for introduction of bazel prod mode, an
alternative mechanism for mixed builds allowlist handling.

 * Decide bazel-mode as close to soong_build main as possible
 * BazelContext itself decides whether a module is allowlisted
 * Separate bp2build and mixed build allowlist

Test: m nothing, manually verified all modules are mixed build disabled
(via metrics)
Test: USE_BAZEL_ANALYSIS=1 m nothing, manually verified that mixed build
disabled/enabled modules are identical before and after change.

Change-Id: I0f55d8b85000cb4a871a099edc6d7d868d7df509
2022-08-23 13:15:12 -04:00
Treehugger Robot
e773613367 Merge "Make FirstTarget treat HostCross separately from Host" 2022-08-23 14:14:45 +00:00
Colin Cross
c0f0eb86db Make FirstTarget treat HostCross separately from Host
Use Target.Os and Target.HostCross as the key in FirstTarget so that
it returns a separate target for host and host cross architectures.
This is useful when host and host cross are both linux_musl, but
host cross is an independenct architecture like arm64.

Also filter the targets returned by ctx.MultiTargets() to match
the HostCross value of ctx.Target() to prevent the newly created
HostCross variants from colliding with Host variants in JNI or
test data attached to Java targets using a common arch.

This relands If75790001afe9d0f9d4d8166f207847851812297 with the
addition of the ctx.MultiTargets() filtering.

Bug: 236052820
Test: TestArchMutator
Change-Id: Ia6fe1185915d174d0ad6b401c227e0e57bee5c24
2022-08-22 14:36:13 -07:00
Dan Albert
237d1710f9 Merge "Drop support for KitKat." 2022-08-22 18:53:48 +00:00
Zhenhuang Wang
409d27712f Add a new test_options.tags attribute to customize test execution
The `test_options.tags` attribute provides additional metadata to
customize test execution by downstream test runners. The tags have no
special meaning to Soong.

Bug: 240928948
Test: manually add `test_options.tags` attribute and run:
    $ refreshmod && \
      cat out/target/product/generic/module-info.json |\
      grep <tags>
Change-Id: I35267f6608e48c6184e56530ef128d93b2f97522
2022-08-22 08:16:17 +00:00
Dan Albert
6bfb6bbde4 Drop support for KitKat.
The NDK is dropping support for this.

Bug: https://github.com/android/ndk/issues/1751
Test: treehugger
Change-Id: I6c03dfc364e7612ce4f45fb58746726983cf5b74
2022-08-19 20:56:28 +00:00
Treehugger Robot
b605679440 Merge "Bluetooth available hack" 2022-08-19 20:54:17 +00:00
Vinh Tran
88b3ba2ae2 Merge "Convert filegroup with AIDL srcs to aidl_library" 2022-08-19 20:36:10 +00:00
Cole Faust
370b37e053 Merge "Bp2build support for runtime_libs" 2022-08-19 20:09:56 +00:00
Treehugger Robot
845c4c1646 Merge "Fix ProcessBazelQueryResponse of filegroup" 2022-08-19 17:16:58 +00:00
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
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
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
Liz Kammer
337e9032c9 Move mixed builds request queuing to final deps
Post deps still supports creating variants, while final deps does not,
this move will ensure all variants are created prior to queuing Bazel
requests.

Test: CI
Change-Id: I92caae009ea3a8769f3f11a9b1ab80de6aac17f3
2022-08-03 15:49:43 -04: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
Liz Kammer
ff966b137e Remove unused bp2build logic from arch.go
Test: go test soong tests
Change-Id: I8a99e3d22b835f6e0d0b16543c738315c6abc4ce
2022-08-01 16:07:45 -04:00
Liz Kammer
7ec40ccb15 Split up config.go
Test: go test soong tests
Change-Id: I717d7f5eec4ce33f71c23ab613a26c33b2b8f203
2022-08-01 16:07:30 -04: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