Commit Graph

6123 Commits

Author SHA1 Message Date
Treehugger Robot
0c3f3321b6 Merge changes I0289d866,Ie7363524 am: 20cf20ba1c am: 8893247f77 am: 7270fbdea5 am: 81dfc43bd6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471977

Change-Id: Idba8ce338e07fcc1f82222a95bb0f3806826a7e8
2020-11-02 23:18:00 +00:00
Martin Stjernholm
d20191c8e1 Merge "Disable sanitizer flags and output files for sanitizer-enabled SDK members." am: 3a456b606e am: 886c71928d am: e72f815fb6 am: 452a3ff5f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1479299

Change-Id: Id7034f09fe34f79eb5b52f400b773f4c462c64b5
2020-10-29 22:02:39 +00:00
Colin Cross
31076b3185 Move stubs related methods out of LinkableInterface
The stubs methods are very specific to cc for now, move them out
of LinkableInterface so they are not shared with rust.  Instead,
create a cc.Module.library field that contains the libraryInterface
to simplify calling libraryInterface methods on cc modules.

Test: all Soong tests
Test: no change to Soong outputs
Change-Id: I0289d866ce1f7a765631fe3101a62b1b4988ba1c
2020-10-29 14:17:54 -07:00
Colin Cross
a717db7304 Don't create stubs variants of static libraries
Statically linking stub implementations doesn't make sense, don't
create stubs variants of static libraries.

Bug: 170784825
Test: all soong tests
Change-Id: Ie73635244516edf6da884e3a7a275971a9bd7839
2020-10-29 14:17:37 -07:00
Martin Stjernholm
3a456b606e Merge "Disable sanitizer flags and output files for sanitizer-enabled SDK members." 2020-10-29 20:12:25 +00:00
Yifan Hong
6b5bbb2f9f Merge "Add target.vendor_ramdisk." am: a03f8fe6da am: ddc1b65c95 am: 13c7373a59 am: 43a9d43d23
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1477643

Change-Id: Ia721b030374cdf269d99ef17f44cc1cac1e02274
2020-10-29 01:40:52 +00:00
Martin Stjernholm
59e0c7a98f Disable sanitizer flags and output files for sanitizer-enabled SDK members.
Test: build/soong/soong_ui.bash --make-mode \
      TARGET_PRODUCT=aosp_blueline_hwasan \
      TARGET_BUILD_VARIANT=userdebug nothing
Test: build/soong/scripts/build-aml-prebuilts.sh \
      runtime-module-{sdk,host-exports} \
      platform-mainline-{sdk,test-exports}
  Check that generated Android.bp files don't differ
Bug: 171754462
Change-Id: Ieef40ff202ceda2d9e613a5d9295f5c9d8160626
2020-10-29 00:26:24 +00:00
Yifan Hong
a03f8fe6da Merge "Add target.vendor_ramdisk." 2020-10-28 20:02:24 +00:00
Yifan Hong
85dbbbfa7b Merge "cc/linker.go: fix typo." am: 8683648981 am: 25861a9867 am: f7277d4af7 am: 5706e14f07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1477642

Change-Id: I25189f2b0c0f4e766a3b1dbca29e269a122c2868
2020-10-28 18:48:41 +00:00
Yifan Hong
8683648981 Merge "cc/linker.go: fix typo." 2020-10-28 17:29:05 +00:00
Yifan Hong
6da33c2af6 Add target.vendor_ramdisk.
Add exclude_srcs, exclude_static_libs, exclude_shared_libs, and
cflags.

Test: pass
Bug: 156098440

Change-Id: I2e10e1f7145932e9bc64f72fa95d0aac776f7f63
2020-10-27 20:51:49 -07:00
Yifan Hong
d2057fbb8e cc/linker.go: fix typo.
The ramdisk variant is using properties from the recovery variant.

Test: TH
Change-Id: Ib2a349e307ab0389413c2d550cf7deb4c7c8ecf4
2020-10-27 20:51:49 -07:00
Treehugger Robot
3d4457b212 Merge "Set stem and suffix for vndk prebuilt libraries" am: 6776629f63 am: 35b7a9506b am: c8f6b8ea0c am: a1c1f6e67f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471663

Change-Id: Ib82fbb19843cf5acbd5f23f74e7434e6df580633
2020-10-28 03:03:25 +00:00
Treehugger Robot
6776629f63 Merge "Set stem and suffix for vndk prebuilt libraries" 2020-10-28 01:25:36 +00:00
Treehugger Robot
f1cf9d7337 Merge "Fix path conflict for vendor_ramdisk_available" am: 07bc11722b am: 194339bceb am: a569d6dd0c am: 9485e47663
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1473538

Change-Id: Ic526b0dd9b3186e954823a9a73f7840619639314
2020-10-27 07:46:15 +00:00
Treehugger Robot
07bc11722b Merge "Fix path conflict for vendor_ramdisk_available" 2020-10-27 06:27:12 +00:00
Inseob Kim
81235ffb96 Set stem and suffix for vndk prebuilt libraries
This is to pass check_elf_files when vendor modules link against vndk
prebuilts. Because of the ".vendor" suffix, the intermediate path
becomes "libfoo.vendor.so" and it makes check_elf_files fail, when stem
and suffix is not specified.

Also, by adding such fields, devices with empty BOARD_VNDK_VERSION can
experience a build break due to collision between VNDK snapshot and VNDK
source module. To completely prevent such collision, all vndk snapshots
become explicitly uninstallable, and they are disabled if
BOARD_VNDK_VERSION is empty.

Test: build/soong/build_test.bash
Change-Id: I54a0f33fd0b84ab9376ee3d75b83113b94bbacae
2020-10-27 14:11:16 +09:00
Yifan Hong
39143a941f Fix path conflict for vendor_ramdisk_available
... and ramdisk_available modules. If a module is both
vendor_ramdisk_available and ramdisk_available, on a device
that mark recovery_as_boot and move_recovery_resources_to_vendor_boot
simultaneously (and incorrectly),
both will be installed to recovery/root/first_stage_ramdisk. Fix the
path conflict of the two variants by moving the vendor_ramdisk variant
to vendor-ramdisk/first_stage_ramdisk instead.

Also update comments for Vendor_ramdisk_available.

Test: m nothing -j
Bug: 156098440

Change-Id: I2b776b6fd8f5a2c361c0f6a89231e3cebc2646f0
2020-10-26 12:50:05 -07:00
Baligh Uddin
637df8e206 Cleanup references to system/core/liblog -> system/logging/liblog
BUG: 170387172
Test: TH
Change-Id: I08053d29beacb0a5c9a4d30443fe6086ce52f83e
2020-10-26 14:34:53 +00:00
Baligh Uddin
818f52fa1a Cleanup references to system/core/base -> system/libbase
BUG: 157656545
Test: TH
Exempt-From-Owner-Approval: Cleanup comment
Change-Id: I4ca92160a2572144a24e26e8999794f297073793
2020-10-26 13:19:44 +00:00
Yifan Hong
73b09eeb21 Merge changes from topic "vendor_ramdisk_soong" am: b646bc183a am: ccee04d20d am: 15cd536e42 am: 7b52a8f2f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470046

Change-Id: Ia9b63201d108728b0934107dc2a37e237d3aa5b6
2020-10-24 02:34:51 +00:00
Yifan Hong
b646bc183a Merge changes from topic "vendor_ramdisk_soong"
* changes:
  Vendor ramdisk modules install to correct location
  Add vendor-ramdisk image to Soong.
2020-10-24 01:08:16 +00:00
Colin Cross
ba0c30c206 Merge "Add llndk_stubs property" am: ed5dee0a8f am: b078a156c3 am: f952e3e274 am: 5b8e5e5815
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1466665

Change-Id: I8e3697e16e81c3891357884ddacefa0ddb7d304f
2020-10-23 20:14:55 +00:00
Colin Cross
ed5dee0a8f Merge "Add llndk_stubs property" 2020-10-23 18:09:42 +00:00
Martin Stjernholm
9649748516 Merge "Rename ART release APEX to com.android.art." 2020-10-23 10:03:24 +00:00
Yifan Hong
60e0cfb5cb Add vendor-ramdisk image to Soong.
Add vendor_ramdisk_available and vendor_ramdisk attribute to
various rules. When a vendor_ramdisk variant of a module is
generated, it is installed to $OUT/vendor-ramdisk.

It is similar to a ramdisk image.
Test: m nothing -j

Change-Id: Ib2d16459f3094dbe21c3bdb7c016cb4b2bf62765
2020-10-22 10:26:26 -07:00
Jooyung Han
b1617aab59 Merge "run vndk-sp closure check before double-loadable" am: 12aa3e44d0 am: c0ef63a3bc am: c2622a46ec am: 288d42b560
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465909

Change-Id: I9e2b2b7830b1d1916149cfe515227b22e46e80c0
2020-10-22 08:23:33 +00:00
Jooyung Han
556a5b02ec Merge "Do not install vndk lib" am: 627ce86770 am: 95542e871b am: b650e6223f am: 94293920ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465904

Change-Id: I42aa2e89df18e011e2650bafae89e5ed1fb8fd0c
2020-10-22 06:09:07 +00:00
Jooyung Han
12aa3e44d0 Merge "run vndk-sp closure check before double-loadable" 2020-10-22 02:01:58 +00:00
Colin Cross
0477b42276 Add llndk_stubs property
Prepare for making the relationship between an llndk_library stubs
module and the cc_library implementation module explicit by
adding an llndk_stubs property.  Each cc_library will be updated
to point to its llndk_library, and the llndk_library name will
be changed to make the .llndk suffix explicit.  Then the implicit
connection and suffix can be removed.

Bug: 170784825
Test: m checkbuild
Change-Id: I6b0482a3f286ec29b2e928551aa4317749f2b499
2020-10-21 10:55:33 -07:00
Martin Stjernholm
7f51107ee6 Rename ART release APEX to com.android.art.
Test: See https://r.android.com/1457217
Bug: 169639321
Change-Id: I6800c7a382486b4e50945cc8b789f4be16482fe6
Merged-In: I6800c7a382486b4e50945cc8b789f4be16482fe6
2020-10-21 15:41:02 +01:00
Jooyung Han
261e158c06 Do not install vndk lib
VNDK libs are installed as part of VNDK APEX, so we don't need to
install them at all.

Bug: 170711679
Test: m
Change-Id: I62b881d6e65d6b007db1d26ab314c140c60e8a4e
2020-10-21 15:20:31 +09:00
Martin Stjernholm
09e2aa9e84 Rename ART release APEX to com.android.art.
Test: See https://r.android.com/1457217
Bug: 169639321
Change-Id: I6800c7a382486b4e50945cc8b789f4be16482fe6
Merged-In: I6800c7a382486b4e50945cc8b789f4be16482fe6
2020-10-20 23:28:49 +01:00
Treehugger Robot
1f8f2d2eb6 Merge "Revert "Add -fdebug-compilation-dir option"" am: 7397707014 am: d94b54b3f1 am: 4fcf38d906 am: 61826e676a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465912

Change-Id: I4f528e4095fb0895452fe86dcf0cc7c37121d8e2
2020-10-20 22:06:59 +00:00
Treehugger Robot
1557a871f0 Merge "Set flag exporter provider for vendor snapshots" am: 4ccc616102 am: b6752c66a1 am: f4c03a96a3 am: 2c84045754
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465902

Change-Id: I8c0cbea49c2d83cfa3f8dfa42f491f147d4c2a90
2020-10-20 21:14:02 +00:00
Kousik Kumar
d207cbed65 Revert "Add -fdebug-compilation-dir option"
Revert submission 1461902-debug-compilation-dir

Reason for revert: "-Xclang" isn't being uniformly respected everywhere. For example, in ".S" compilations, when I pass `-Xclang -fdebug-compilation-dir=.", the assembler seems to be ignoring it and then inserting the `pwd` into the command, however when I pass "-fdebug-compilation-dir=.", it strips out the path to the current working directory.
This indicates that we need to update re-client's input processor so that we can pass -fdebug-compilation-dir=. without "-Xclang" and then remove `PWD` setting.
I'll followup with a patch to add -fdebug-compilation-dir.

Reverted Changes:
Ib0f271e55:Add -fdebug-compilation-dir option
Ifa0592af5:Remove env-var-allowlist

Change-Id: I12fa0bf2fb4975ac3d1bffaf1358331548abc339
2020-10-20 09:29:34 -04:00
Treehugger Robot
73d4e8fb73 Merge "Do not exclude VNDK modules from SoC/Product-specific modules" am: 1537692837 am: 4aeea16df3 am: fffb427b3f am: f1a496f0a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465422

Change-Id: I2b83910387428a2e7a0102de71d0634806645890
2020-10-20 02:46:42 +00:00
Treehugger Robot
4ccc616102 Merge "Set flag exporter provider for vendor snapshots" 2020-10-20 00:33:49 +00:00
Treehugger Robot
1537692837 Merge "Do not exclude VNDK modules from SoC/Product-specific modules" 2020-10-20 00:02:36 +00:00
Jooyung Han
479ca17bb1 run vndk-sp closure check before double-loadable
If vndk-sp closure fails, the error message mentions it instead of
double-loadable error. It would be more helpful since vndk-sp is more
straightforward to fix.

Bug: 171080110
Test: m (soong test added)
Change-Id: Icc762a4ffb4a8d7d6b31ef1daac17f13383518bf
2020-10-19 18:57:45 +09:00
Inseob Kim
67be732de1 Set flag exporter provider for vendor snapshots
Also, TestVendorSnapshotUse is amended so it can test whether vndk
snapshot and vendor snapshot modules export their flags correctly.

Bug: N/A
Test: manual test
Change-Id: Ie62ad1206449b1a40db8a2282af00616db693017
2020-10-19 10:15:28 +09:00
Treehugger Robot
9a32b73512 Merge "Set flag exporter provider for vndk_prebuilt libs" am: 509a9d35ac am: 85e95f70a0 am: 0ba02d9ae8 am: 0598680dea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1463642

Change-Id: I30baa389f92ae2667663e534cb5f1dff3ff6470f
2020-10-18 13:41:01 +00:00
Treehugger Robot
509a9d35ac Merge "Set flag exporter provider for vndk_prebuilt libs" 2020-10-18 12:19:05 +00:00
Justin Yun
543f60bc31 Do not exclude VNDK modules from SoC/Product-specific modules
The VNDK modules were excluded from SoC/Product specific modules
because they were installed to system partition. However, as they
moved to VNDK APEX, we don't need to make a exception for VNDK
modules.

Bug: 170711679
Test: Follow the steps below:
$ lunch aosp_x86-eng
$ m nothing # ctrl-C while running soong_build
$ rm out/soong/.soong.in_make
$ m --skip-make libc

Change-Id: I001bc98e4031e5e8bcdea9cb920caa21b8744752
2020-10-18 02:06:48 +00:00
Kousik Kumar
d1f8454d18 Merge "Add -fdebug-compilation-dir option" am: 5109979468 am: 157f088af3 am: 48f570f8a0 am: 80121541d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1460104

Change-Id: I42baaaf2a2f97bab3024baa803dd0208fcb92f7e
2020-10-16 07:35:17 +00:00
Inseob Kim
70cb3b63b4 Set flag exporter provider for vndk_prebuilt libs
vndk_prebuilt exports some flags, so the provider should be set.

Bug: N/A
Test: m
Change-Id: I6c4df4139e66f992b63686adfe0635f08bafa649
2020-10-16 16:23:05 +09:00
Kousik Kumar
5109979468 Merge "Add -fdebug-compilation-dir option" 2020-10-16 05:52:51 +00:00
Tom Cherry
016b1f9c6e Merge "Update liblog header paths after git project move" am: 2517c408e5 am: 5a09f1ca3b am: e9adce2139 am: 8b7dec844b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1455957

Change-Id: If4bf27379d8aee6b17e05c8afb6fba2ea98133d9
2020-10-15 23:13:33 +00:00
Tom Cherry
2517c408e5 Merge "Update liblog header paths after git project move" 2020-10-15 21:24:58 +00:00
Kousik Kumar
578ba0021f Add -fdebug-compilation-dir option
The main use of this flag is to be to make both the debug info
and the build command line be independent of the compilation dir.
See: https://reviews.llvm.org/D63387 & https://blog.llvm.org/2019/11/deterministic-builds-with-clang-and-lld.html

Removed -fdebug-prefix-map and PWD variable being set in the compile
command line - these were workarounds we originally did to ensure that
the compile output is independent of the working directory and are no
longer needed now that we have -fdebug-compilation-dir.

Test: Ran "m
out/target/product/crosshatch/obj/SHARED_LIBRARIES/libexif.vendor_intermediates/same_vndk_variants.timestamp"
which fails on an RBE hardened stack without this change and passes with
this change.

Bug: b/169266636
Change-Id: Ib0f271e55f6cf0c89a30e65d3a0b25fe3f3a8f48
2020-10-15 15:25:08 -04:00