Commit Graph

32193 Commits

Author SHA1 Message Date
Ivan Lozano f9e2172aec Refactor for preliminary Rust vendor image support
Refactors parts of CC to prepare for preliminary support for using Rust
static libraries in vendor images. Some previously private functions are
made public, and additional functions are added to LinkableInterface so
GetMakeLinkType can be passed a LinkableInterface.

Bug: 172525289
Test: m
Change-Id: I5fda48e79532fe9ceab255e18d910af58048a123
2020-12-10 10:29:48 -05:00
Treehugger Robot a4fd2ea7b2 Merge "Add neuralnetworks_utils_hal_service to apex/allowed_deps.txt" 2020-12-10 12:21:57 +00:00
Inseob Kim de5744a199 Add some comments for VNDK / vendor snapshots
Also some files are refactored:

- snapshot_prebuilt.go is separated from vendor_snapshot.go. Now
vendor_snapshot.go contains snapshot generation codes, while
snapshot_prebuilt.go contains module definition codes.

- Some helper functions are moved from snapshot_utils.go to util.go.

- Some ambiguous names of types and functions are renamed.

We still can add more detailed comments about the snapshots. They are to
be uploaded in follow-up changes, to avoid making this change too big.

Bug: 173474311
Test: generate vndk and vendor snapshot
Change-Id: I18fa837ccdf44a042b7a78e5c3df25fd2de96d95
2020-12-10 21:12:39 +09:00
Martin Stjernholm 62bd802826 Merge "Propagate the Soong config variable for enabling ART Module building." 2020-12-10 09:32:19 +00:00
Treehugger Robot cac133df14 Merge "Remove AndroidMkExtraFootersFunc entries param." 2020-12-10 07:04:02 +00:00
Xin Li 13850821b2 Merge "DO NOT MERGE - Merge Android R QPR1" 2020-12-10 02:18:29 +00:00
Christopher Parsons 0529cd2d59 Merge "Improve comments in cc/library.go and cc/linkable.go." 2020-12-10 02:17:58 +00:00
Xin Li bfb1c5939a DO NOT MERGE - Merge Android R QPR1
Bug: 172690556
Merged-In: I16d3f4210df3d1e2d59a5785422ad732546935e4
Change-Id: I50bf9940fe5e1c9c7dac4f3c50e417e39e03ef30
2020-12-09 17:44:01 -08:00
Treehugger Robot 896cb8d6c6 Merge "Add missing export/unexport directives" am: 67e72529c4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1513335

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16d3f4210df3d1e2d59a5785422ad732546935e4
2020-12-10 00:49:35 +00:00
Treehugger Robot 67e72529c4 Merge "Add missing export/unexport directives" 2020-12-10 00:36:09 +00:00
Jiyong Park 2b33ad60aa Merge "test_for is available for all cc_* module types" am: 2920d2cec0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1517638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38d61acc50786ee97ee85e7cf89d9664dd91a148
2020-12-10 00:33:40 +00:00
Jiyong Park 2920d2cec0 Merge "test_for is available for all cc_* module types" 2020-12-10 00:16:29 +00:00
Kalesh Singh d49e1829e6 Add android.hardware.memtrack-unstable-ndk_platform
Bug: 175021432
Test: Fixes build failure on aosp/1518666
Change-Id: Ic4dd70e2c707c8461f3a591d023555b26197fc14
2020-12-09 19:16:09 -05:00
Yan Yan 1a93af7632 Allow IPsec module to depend on modules-utils-build
This is generated by build/soong/scripts/update-apex-allowed-deps.sh

Bug: 157577190
Test: builds
Change-Id: Ie71c63238c16c9cade400e1b3df02c35d915265c
2020-12-09 15:48:55 -08:00
Ivan Lozano eb114e6509 Merge "Move prefer_rlib from binary to base compiler." am: 366cb49b9f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518620

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic82eb1788b20c35995e138d2fea2c1b38b9a3e7e
2020-12-09 23:32:37 +00:00
Ivan Lozano 366cb49b9f Merge "Move prefer_rlib from binary to base compiler." 2020-12-09 23:02:53 +00:00
Treehugger Robot 8f474b0c34 Merge "Provide an interface for shared paths between Soong and Soong UI." am: 5839c91074
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1519964

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32a6834820cf31b84eb8054d9b6fd3f92ab1ef38
2020-12-09 17:33:34 +00:00
Treehugger Robot 5839c91074 Merge "Provide an interface for shared paths between Soong and Soong UI." 2020-12-09 17:31:02 +00:00
Treehugger Robot 69ac81038a Merge "Soong: remove output file before running signapk" am: 413c3bea63
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffe70681136af6d8ad427823b1583aa44246a87c
2020-12-09 17:24:52 +00:00
Treehugger Robot 413c3bea63 Merge "Soong: remove output file before running signapk" 2020-12-09 16:58:02 +00:00
Ivan Lozano 3e9f9e47cf Add min_sdk_version to Rust modules.
Add the min_sdk_version property to Rust modules so they can declare
a minimum SDK version they support for use with APEX modules.

Test: New Soong test passes.
Bug: 174862583
Change-Id: I2829053a320f50c218783dee5adbeff9cef81e8e
2020-12-09 11:30:44 -05:00
Slava Shklyaev af1df7008b Add neuralnetworks_utils_hal_service to apex/allowed_deps.txt
Similarly to the other neuralnetworks_utils_hal_* targets, this new
target is a result of restructuring our code.

Generated with build/soong/scripts/update-apex-allowed-deps.sh

Bug: 170289677
Test: m
Change-Id: I7ca24e8afe6cfb978d51f0b55389615e5f28a1e0
Merged-In: I7ca24e8afe6cfb978d51f0b55389615e5f28a1e0
(cherry picked from commit c1a84ca5cb)
2020-12-09 16:01:31 +00:00
Ivan Lozano ea08613dd3 Move prefer_rlib from binary to base compiler.
Moves the prefer_rlib property out from being exclusively a binary
property to one thats part of the base compiler properties. This
provides a little more control over the libstd linkage in our libraries.
Specifically, this enables a usecase where rust_ffi_shared needs to link
against libstd statically rather than dynamically.

Bug: 175121262
Test: New Soong tests pass.
Change-Id: If68014c684a75ba70e9d7dacbb01c7d360dc25a1
2020-12-09 09:55:12 -05:00
Mohammad Islam 8f1078cdcd Merge "Enable soong build tool to handle APEX compression" am: 5d2c54f1e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I567fada250e030005c9c103b1c24228bf0b52988
2020-12-09 14:49:33 +00:00
Mohammad Islam 5d2c54f1e2 Merge "Enable soong build tool to handle APEX compression" 2020-12-09 14:34:42 +00:00
Treehugger Robot a646d475a1 Merge "Soong: remove output file before running SoongZip" am: 5b0b94ecea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511278

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4eeea88254801ba162251789db35894f967df94d
2020-12-09 08:31:36 +00:00
Treehugger Robot 5b0b94ecea Merge "Soong: remove output file before running SoongZip" 2020-12-09 08:05:06 +00:00
Treehugger Robot 0a30c0b67b Merge "Prebuilt is enabled even if the source one is not." am: 6bba8382af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1521068

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I316b1b487f9703daf085e71fe09c251a25347d9e
2020-12-09 07:52:52 +00:00
Treehugger Robot bf152250fe Merge "Soong: add missing header-abi-dumper inputs" am: 61cb7ed6ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511277

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79d3463da915a6ccab288616811a2f8ba26cfa59
2020-12-09 07:52:19 +00:00
Treehugger Robot 6bba8382af Merge "Prebuilt is enabled even if the source one is not." 2020-12-09 07:29:24 +00:00
Treehugger Robot 61cb7ed6ff Merge "Soong: add missing header-abi-dumper inputs" 2020-12-09 07:26:36 +00:00
Jiyong Park 46a512f1f5 test_for is available for all cc_* module types
Sometimes, the ordinary cc_library_* modules need test_for property when
they are part of a bigger cc_test. Instead of propagating the test_for
property from cc_test to its dependencies, this change requires the very
dependency which needs access to the private part of an APEX to
explicitly have the test_for property.

Bug: 161575591
Test: m
Change-Id: Ie1ffe9a60cd2ab02d41bbe5a98225a40392470f6
2020-12-09 12:59:19 +09:00
Jaewoong Jung 729c0bdb54 Prebuilt is enabled even if the source one is not.
This fix a bug in a recent android_app_import-related change
(I8215aa1a6dad74b503eaa1169a64f8c30dda287c) where it uses an incorrect
module reference, and so disables a prebuilt module if its source-based
counterpart is disabled.

Test: app_test.go
Bug: 152343232
Change-Id: Ic7f5ca40be58f06e44b5ec4945caf209ef2dae96
2020-12-08 19:11:54 -08:00
Rupert Shuttleworth 355b85f562 Add dependency checker special case for out/build_date.txt. am: 0bc9a9ad6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1519821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id26372d1feba3a0a4b819647446f01c06bde26c8
2020-12-09 02:22:13 +00:00
Rupert Shuttleworth 0bc9a9ad6b Add dependency checker special case for out/build_date.txt.
Test: Future TH presubmit.
Change-Id: I4f80cf12be4aa1a3040b38ac7c6bed593aefd65e
2020-12-08 23:28:25 +00:00
Ivan Lozano 45f2e6c094 Merge "Add LinuxBionic toolchain to Rust" am: 78b340f375
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1519844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4eb3983dba740c2367b9bc87c47ca1f89f2cb8de
2020-12-08 22:47:53 +00:00
Martin Stjernholm f371381cac Propagate the Soong config variable for enabling ART Module building.
It is set in art/build/build-art-module.sh.

Test: art/build/build-art-module.sh
Bug: 172480617
Change-Id: Idbb3478667a2265ba115922207cb6d9aa6c4c91d
2020-12-08 22:30:03 +00:00
Ivan Lozano 78b340f375 Merge "Add LinuxBionic toolchain to Rust" 2020-12-08 22:04:49 +00:00
Treehugger Robot 789c32a464 Merge "Print both the implicit and explicit environment variables when running Bazel." am: 0903e89f4a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1519819

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58777b31b51b9ecbbd2980db8822bcc18b659a2a
2020-12-08 21:22:26 +00:00
Treehugger Robot 0903e89f4a Merge "Print both the implicit and explicit environment variables when running Bazel." 2020-12-08 20:50:17 +00:00
Patrice Arruda 83842d7235 Provide an interface for shared paths between Soong and Soong UI.
Code refactoring has been done for logs directory logic code since
the bazel metrics directory depends on the log directory. For builds
that did not specify a dist directory, the log directory is under
out directory. With dist, the logs directory is under <dist dir>/logs.
This matters for Android CI builds where the metrics files are
placed under logs directory. With this change, the bazel metrics
directory and corresponding files will be under <dist dir>/logs
directory for Android CI builds.

Bug: b/174479728
Test: * USE_BAZEL=1 m nothing (bazel_metrics dir in out dir)
      * m nothing (bazel_metrics dir deleted)
      * DIST_DIR=/tmp/build USE_BAZEL=1 m nothing dist (bazel_metrics
        is in /tmp/build/logs directory)

Change-Id: Ic9e1ff49a1964fcaaf801bde2c19f33597ca1db4
2020-12-08 20:24:14 +00:00
Colin Cross a0fbd44db8 Merge "Reimplement DepSet as a wrapper around a generic implementation" am: 69e9230641
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1513604

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I626cfa1c816a8ba3595671d0b9619397bcf90736
2020-12-08 19:52:00 +00:00
Colin Cross 69e9230641 Merge "Reimplement DepSet as a wrapper around a generic implementation" 2020-12-08 19:36:22 +00:00
Jiyong Park f2cc1b77f3 rust ffi libraries can be included in APEX
This CL fixes a bug that rust_ffi_shared libraries can't be included in
an APEX either directly (via native_shared_libs property) or indirectly.

Bug: 175105284
Test: m
Change-Id: I2e2d3e11b3901f3412b9725e47a8ebf31f93847b
2020-12-09 00:29:54 +09:00
Paul Duffin 1e030c5937 Merge changes Ie51f097e,Ibf26da14 am: c27dd1a9bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1516939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8c3df719a2a91a7b0cc7a382f8411afd3bf624e
2020-12-08 14:34:48 +00:00
Anton Hansson f261d7c2bf Merge "Add native modules build utils to allow list" am: d230030dfd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41c3cb22b2f18b22b128e418976b2e7f7c0e7aef
2020-12-08 14:34:05 +00:00
Paul Duffin c27dd1a9bb Merge changes Ie51f097e,Ibf26da14
* changes:
  Use apex and jar to select boot image dex jar
  Ensure that only one dex jar is chosen for each boot image library
2020-12-08 14:27:35 +00:00
Anton Hansson d230030dfd Merge "Add native modules build utils to allow list" 2020-12-08 14:19:38 +00:00
Ivan Lozano bf3b6e9b8d Add LinuxBionic toolchain to Rust
The LinuxBionic toolchain wasn't defined for Rust.

This would lead to build breakage if a CC module that targeted Linux
Bionic linked against a Rust FFI module.

Bug: 174873186
Test: Build breakage no longer occurs if CC module with Rust dependency
      is built for the Linux Bionic target.
Change-Id: I39df7b9a29372986c9beeb1fe5602140d805d731
2020-12-08 09:04:21 -05:00
Orion Hodson 50ad989646 apex/allowed_deps: add libnetjniutils
Bug: 158749603
Test: m
Change-Id: I00a8d61eebba5ae43f2338822854264dfabad4af
2020-12-08 13:55:16 +00:00