Commit Graph

59357 Commits

Author SHA1 Message Date
Jingwen Chen
c71569ef5d Export default apex version from updatable_modules.go to Bazel's am: 7810e17e54 am: 88516533e1 am: 0e0dd7d4c7 am: 08f1333ec8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168944

Change-Id: I56bc811860f0953652de4fb1ca90e9a9d0adb3c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 13:20:34 +00:00
Jingwen Chen
08f1333ec8 Export default apex version from updatable_modules.go to Bazel's am: 7810e17e54 am: 88516533e1 am: 0e0dd7d4c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168944

Change-Id: I722be3e2e6028d4680699b93584144b4eda7d070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 13:04:31 +00:00
Jingwen Chen
0e0dd7d4c7 Export default apex version from updatable_modules.go to Bazel's am: 7810e17e54 am: 88516533e1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168944

Change-Id: Ie5c600a9547b39abc8e6a3268d4529a6616a4cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 12:39:22 +00:00
Jingwen Chen
88516533e1 Export default apex version from updatable_modules.go to Bazel's am: 7810e17e54
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168944

Change-Id: Ic5fde55e1dc90d60772635458f16e5626cf8b41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 12:21:45 +00:00
Alexei Nicoara
f99fac8f5a Merge "Moving default version outside of apex package" am: 21b027dca8 am: 18ecb86247 am: 65e6a8c7b9 am: 4e1ef5f5b2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167105

Change-Id: I262912a958483563fe88a66d1fec600fc36b3617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 11:21:46 +00:00
Alexei Nicoara
4e1ef5f5b2 Merge "Moving default version outside of apex package" am: 21b027dca8 am: 18ecb86247 am: 65e6a8c7b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167105

Change-Id: I3e8f4f51a578b939da8be69145e2d88ad369460d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 11:06:46 +00:00
Jingwen Chen
7810e17e54 Export default apex version from updatable_modules.go to Bazel's
apex_toolchain through soong_injection.

This is necessary to keep both Bazel and Soong in sync.

Test: presubmit
Bug: 238723069
Fixes: 238153998

Change-Id: Ibf4a8ed91d358dc7800c10e4112485a52f0606bb
2022-08-02 10:11:36 +00:00
Alexei Nicoara
65e6a8c7b9 Merge "Moving default version outside of apex package" am: 21b027dca8 am: 18ecb86247
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167105

Change-Id: I14e748b60f758db5e002c13f0d39738de9acd1b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 09:36:30 +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
21b027dca8 Merge "Moving default version outside of apex package" 2022-08-02 08:52:01 +00:00
Matthew Maurer
31d2115d45 Merge "Revert "rust: Only allow bindgen to produce rlibs."" am: d13d15a9c0 am: b0bb92726e am: 5525801a3c am: 495e06c2e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2170067

Change-Id: Ibc45db63571ff3e1cb6446297cad2071b3044e2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 23:44:56 +00:00
Matthew Maurer
495e06c2e2 Merge "Revert "rust: Only allow bindgen to produce rlibs."" am: d13d15a9c0 am: b0bb92726e am: 5525801a3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2170067

Change-Id: If4434137717214dbd6c6d9e1cf45020f4ccd62c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 23:27:44 +00:00
Matthew Maurer
5525801a3c Merge "Revert "rust: Only allow bindgen to produce rlibs."" am: d13d15a9c0 am: b0bb92726e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2170067

Change-Id: Id4c910b2349953244511f4d30afca06b5711043a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 23:09:50 +00:00
Matthew Maurer
b0bb92726e Merge "Revert "rust: Only allow bindgen to produce rlibs."" am: d13d15a9c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2170067

Change-Id: I8ad271de87803942a99f899d90f36f8cbbb1e774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 22:41:40 +00:00
Matthew Maurer
d13d15a9c0 Merge "Revert "rust: Only allow bindgen to produce rlibs."" 2022-08-01 22:19:32 +00:00
Matthew Maurer
ed8f74fa55 Merge "rust: Only allow bindgen to produce rlibs." am: a8ea3ff66e am: 968197389a am: deee8247a4 am: 4ba9821092
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2165697

Change-Id: I5dc2bbdb6d945dfe420ed794cf2200f18cb940fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 22:15:02 +00:00
Matthew Maurer
b983c8971b Revert "rust: Only allow bindgen to produce rlibs."
This reverts commit 53a452d1ff.

Reason for revert: Broken build

Change-Id: I4c1c6f2166c3729ef1916ad7c21e32599c5e692f
2022-08-01 21:59:00 +00:00
Matthew Maurer
4ba9821092 Merge "rust: Only allow bindgen to produce rlibs." am: a8ea3ff66e am: 968197389a am: deee8247a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2165697

Change-Id: I2c2b82c13869f54c5cb16e0359f1ea28d2fdf22b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 21:49:52 +00:00
Matthew Maurer
deee8247a4 Merge "rust: Only allow bindgen to produce rlibs." am: a8ea3ff66e am: 968197389a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2165697

Change-Id: I4105599d763489aaedf91567ac4c0f6a7df15473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 21:31:12 +00:00
Matthew Maurer
968197389a Merge "rust: Only allow bindgen to produce rlibs." am: a8ea3ff66e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2165697

Change-Id: If8dc51433d2bbaf509d4bbd3c35e5b91c884d9ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 21:05:53 +00:00
Matthew Maurer
a8ea3ff66e Merge "rust: Only allow bindgen to produce rlibs." 2022-08-01 20:50:41 +00:00
Matthew Maurer
53a452d1ff rust: Only allow bindgen to produce rlibs.
Generated bindings are intended to be slim translation layers, usually
consisting of nothing more than type signatures and constants.
Generally, they should also be used in exactly one location by the safe
wrapper for these bindings. By preventing them from building as
`dylib`s, we avoid the per-library overhead of these non-reused pieces
of code.

Additionally, default visibility restrict all bindgen modules to their
subpackages. This is being done both:
* to encourage use of a single safe bindings crate
* to avoid diamond dependency graphs with mixed rlib/dylib dependencies

Bug: 166332519
Test: m; Make sample module use dylib bindgen dependency, see build failure.
Change-Id: I8e9d9cb851c2ec99f4ed63e6e18c4ba26b29721c
2022-08-01 16:28:51 +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
88f1d5d368 Merge "Implement mixed builds for apex modules, take 2." am: 88e7512572 am: 953254b150 am: 1c0be10898 am: e4fe8254fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167802

Change-Id: If608e5c6aaaabcef7c2586a19f6779cca91910d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-30 00:26:42 +00:00
Treehugger Robot
e4fe8254fe Merge "Implement mixed builds for apex modules, take 2." am: 88e7512572 am: 953254b150 am: 1c0be10898
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167802

Change-Id: Ic9cce0d12bd1f8cb72fb459063ffe289ce55d889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 23:55:40 +00:00
Treehugger Robot
1c0be10898 Merge "Implement mixed builds for apex modules, take 2." am: 88e7512572 am: 953254b150
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167802

Change-Id: I52202e3bdcab33d00a63008c1219aa7cf4140641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 23:32:01 +00: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
Treehugger Robot
88e7512572 Merge "Implement mixed builds for apex modules, take 2." 2022-07-29 22:43:19 +00:00
Alix Espino
53cbe7c244 Merge "Implement bp2build for linker_config" am: 2f384a7432 am: ce91531649 am: 5d6bea6671 am: e288f38daa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2115194

Change-Id: I5d12d9740e378c9caaee2331b419466cd681e57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 20:03:02 +00:00
Alix
cdf0defcd8 filter unknown clang cflags in bp2build am: 1be00d4e48 am: 33032667e0 am: 0605eef3ad am: 798f0f7861
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2137955

Change-Id: Ib90e35e74fbe11261ff3ea9177a40afea20581e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 20:02:08 +00:00
Alix Espino
e288f38daa Merge "Implement bp2build for linker_config" am: 2f384a7432 am: ce91531649 am: 5d6bea6671
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2115194

Change-Id: I5b526a4ccf46db542e9601b17aa70096cf6124c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 19:38:57 +00:00
Alix
798f0f7861 filter unknown clang cflags in bp2build am: 1be00d4e48 am: 33032667e0 am: 0605eef3ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2137955

Change-Id: Idf5718d6ef3e421f2731bdea871ec0684d0f3b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 19:38:45 +00:00
Alix Espino
5d6bea6671 Merge "Implement bp2build for linker_config" am: 2f384a7432 am: ce91531649
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2115194

Change-Id: Ic17b5da2915196583487b29ec939f5e178138e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 19:22:38 +00:00
Alix
0605eef3ad filter unknown clang cflags in bp2build am: 1be00d4e48 am: 33032667e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2137955

Change-Id: I9a84fa9865cff567df403688dc9636badb26a762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 19:22:27 +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
33032667e0 filter unknown clang cflags in bp2build am: 1be00d4e48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2137955

Change-Id: I1a586c5fe3ffd7f3c767bcd9c79d9d00cfde4302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 18:48:30 +00:00
Alix Espino
2f384a7432 Merge "Implement bp2build for linker_config" 2022-07-29 18:19:00 +00:00
Alix
1be00d4e48 filter unknown clang cflags in bp2build
filtering out no longer useful flags in bp2build conversion

Test: cc_library_shared_conversion_test
Bug: 231995978
Change-Id: I5172f6d07a8928291bbc11bd8802678b33cc5b1f
2022-07-29 12:17:25 +00:00
Matthew Maurer
5b18839441 rust: Rust is now GA for platform usage am: cf3844c879 am: 494fccd98f am: 399519edca am: edec0987b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168482

Change-Id: Idc4b2c0fdaa0c5a145d0ed72a10d6b39a6cbc6cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 22:08:41 +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
Matthew Maurer
edec0987b1 rust: Rust is now GA for platform usage am: cf3844c879 am: 494fccd98f am: 399519edca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168482

Change-Id: Iefba36b626e8e17cd6ff984216b1857f33863d49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 21:42:57 +00:00
Matthew Maurer
399519edca rust: Rust is now GA for platform usage am: cf3844c879 am: 494fccd98f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168482

Change-Id: I1aa0094bd4c54e1ea31694af765a46e2d4e2ac4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 21:16:25 +00:00
Matthew Maurer
494fccd98f rust: Rust is now GA for platform usage am: cf3844c879
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168482

Change-Id: I8977e2631135b64c0c399bf7969bc080188b6061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 20:57:25 +00:00
Matthew Maurer
cf3844c879 rust: Rust is now GA for platform usage
Rust is now approved for general platform use without project-specific
review.

Bug: 240501326
Test: m
Change-Id: I6fd4c22ba2c6a3a5bac6f91fd087fe5cffe46c01
2022-07-28 06:57:26 -07:00
Ken Chen
adc07dce61 Merge "Disallow '_' in bpf source name" am: d8cded58fe am: 9b259932f7 am: 8219d90a58 am: 318d8c51f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2147825

Change-Id: Ib33a7069c9301d4836694f16fb5926f6ec5d8415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 08:50:51 +00:00
Ken Chen
318d8c51f2 Merge "Disallow '_' in bpf source name" am: d8cded58fe am: 9b259932f7 am: 8219d90a58
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2147825

Change-Id: Ie200e91f401c39014fcf2f5531095ec480ee81a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 08:28:08 +00:00
Ken Chen
8219d90a58 Merge "Disallow '_' in bpf source name" am: d8cded58fe am: 9b259932f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2147825

Change-Id: I3c947dba5da6364807fd69bcdb21fba683586804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 08:03:59 +00:00
Ken Chen
9b259932f7 Merge "Disallow '_' in bpf source name" am: d8cded58fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2147825

Change-Id: Ia3ea5b08ccd37f096ad7d9cd053a45b25b045ba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 07:21:56 +00:00
Ken Chen
d8cded58fe Merge "Disallow '_' in bpf source name" 2022-07-28 07:00:12 +00:00
Treehugger Robot
d33dcd2932 Merge "fix typo in AARImport prebuilt type assertion" am: 28ee99f3c3 am: 77f6fef4ed am: 0fe2d25263 am: 323015fda6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2164784

Change-Id: I74a254e544932d41cde6a2866901f3544fb34b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 19:09:44 +00:00