Commit Graph

6388 Commits

Author SHA1 Message Date
Justin Yun
107a4cb56c Update test_min_api_level for cc_test
By replacing MinApiLevelModuleController with
ShippingApiLevelModuleController, we don't need to define
api-level-prop option. The property name must not be a parameter but
be defined in the module controller.

test_min_sdk_version is removed as it is not used.

Bug: 178990561
Test: atest vts_core_liblp_test
Change-Id: Ib4660b91c7adb2ec8b970197dc6f65b8e6952a66
2021-02-20 00:46:21 +00:00
Elliott Hughes
ca8a75e102 Merge "__ANDROID_UNGUARDED_AVAILABILITY__ is gone now." am: 272649ceb5 am: 8198c438ca am: eac2d22f6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1596932

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I13975b59c2c7e5c4c13c1795458932e99efc2d34
2021-02-20 00:32:30 +00:00
Colin Cross
aa2555387d Add ctx to AndroidMkExtraEntriesFunc
Add a ctx parameter to AndroidMkExtraEntriesFunc to allow them to
access providers.

Test: m checkbuild
Change-Id: Id6becc1e425c3c3d8519248f8c0ce80777fac7cc
Merged-In: Id6becc1e425c3c3d8519248f8c0ce80777fac7cc
2021-02-19 23:05:40 +00:00
Elliott Hughes
272649ceb5 Merge "__ANDROID_UNGUARDED_AVAILABILITY__ is gone now." 2021-02-19 22:27:11 +00:00
Julien Desprez
2e6a5548ce Merge "Switch cc_test host_supported: true to unit tests" am: 251261d01b am: fb7470923a am: c2457399a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1576042

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcee697e2fe9b23e86ca171f4fbabe4d066d84ee
2021-02-19 19:01:05 +00:00
Elliott Hughes
5a8c9531e4 __ANDROID_UNGUARDED_AVAILABILITY__ is gone now.
So no need to keep `-D`ing it.

Bug: http://b/179067538
Test: treehugger
Change-Id: If5bcead40d3bb355c241e363a8f1a956cb144438
2021-02-19 10:43:19 -08:00
Paul Duffin
3cb603eb51 Add tests for exported generated headers
Improves the test coverage for exporting of generated headers. These
tests highlight the bug described in b/180712399.

Follow up changes will refactor and fix bugs in this code. Adding the
tests separately help ensure that those changes do not inadvertantly
change the behavior.

Test: m nothing
Bug: 180712399
Change-Id: I0225b0cf53259071edb99a94be5014ed0e019bde
2021-02-19 17:12:01 +00:00
Julien Desprez
251261d01b Merge "Switch cc_test host_supported: true to unit tests" 2021-02-19 16:55:04 +00:00
Jingwen Chen
d82b711739 Merge "bp2build: cc_object converter." am: 4e86b6ae43 am: d178288566 am: 80939fbbe1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1580344

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib51378b26b297469e17d5495ca15b54cd021098d
2021-02-19 05:54:04 +00:00
Jingwen Chen
4e86b6ae43 Merge "bp2build: cc_object converter." 2021-02-19 03:54:43 +00:00
TreeHugger Robot
bd72625520 Merge "Add ctx to AndroidMkExtraEntriesFunc" into sc-dev 2021-02-19 01:03:10 +00:00
vichang
d4ce81e6eb Merge "Non-installable module should not be installed into a fuzzer .zip package" am: cd821d8283 am: 8c488d9075 am: c96569722b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1579438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1398cb096137fa516b64b906211fddfeeb1447cc
2021-02-18 10:48:56 +00:00
vichang
cd821d8283 Merge "Non-installable module should not be installed into a fuzzer .zip package" 2021-02-18 09:59:06 +00:00
Jingwen Chen
8c1b97e01b bp2build: cc_object converter.
This CL introduces a basic bp2build converter for cc_object modules.
cc_objects maps cleanly to cc_library targets, but with -fnoaddrsig.

This CL also demonstrates generating include deps within a macro to
allow the cc_object compilation to depend on a relative-include header
within an include dir.

e.g. if "foo.cc" includes "android/log.h" and the latter is located at
"include/android/log.h", the autogenerated header deps would export
"android/log.h" correctly to the foo.cc upstream target.

Test: GENERATE_BAZEL_FILES=true m nothing && bp2build-sync write && bazel build //bionic/libc:crtbegin_so1

Change-Id: Ifd9e097051ec184ab0a1929d07918f0ff4f24d98
2021-02-18 03:27:28 -05:00
Colin Cross
f79fee864c Add ctx to AndroidMkExtraEntriesFunc
Add a ctx parameter to AndroidMkExtraEntriesFunc to allow them to
access providers.

Bug: 180540739
Test: m checkbuild
Change-Id: Id6becc1e425c3c3d8519248f8c0ce80777fac7cc
2021-02-17 15:24:43 -08:00
Dan Albert
4c3b3c7c50 Merge "[arm64] Build NDK with PAuth and BTI" am: a175126009 am: bfe770d03f am: bb4c44e0c2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558552

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44a54ab4900ae02bf0650cb86545a847f508cd5f
2021-02-17 23:18:46 +00:00
Dan Albert
a175126009 Merge "[arm64] Build NDK with PAuth and BTI" 2021-02-17 21:37:41 +00:00
Chih-hung Hsieh
fa762e7121 Merge "Change default DEFAULT_TIDY_HEADER_DIRS to empty" am: 6e304f5a88 am: 030f75fa56 am: 39e4767dcb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1584224

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6eb28309d7655b7cc75f80335e52391df478f228
2021-02-17 19:48:45 +00:00
Chih-hung Hsieh
6e304f5a88 Merge "Change default DEFAULT_TIDY_HEADER_DIRS to empty" 2021-02-17 18:34:48 +00:00
Victor Chang
00c144f930 Non-installable module should not be installed into a fuzzer .zip package
libicu_* fuzzer depends on installable cc modules and non-installable
cc modules with the same name, because the non-installable modules are
stubs used in the compile-time, and shouldn't be used in runtime.

Bug: 175583039
Test: make haiku dist
Test: Run 2 arbitrary binaries from out/dist/fuzz-target-x86_64.zip on device
Test: Run 2 arbitrary binaries from out/dist/fuzz-host-x86_64.zip on host
Change-Id: I0ecf24bb83e3985da3b8f393adab8c87ab7400c6
2021-02-17 16:40:25 +00:00
Rupert Shuttleworth
a68296e063 Merge "Add cc_library_headers support to bp2build." am: a0516f76ab am: 9632827e78 am: 90fc4c976c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1589371

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I511571b268dc12107f6eae8d06af0443f765227a
2021-02-17 10:50:50 +00:00
Rupert Shuttleworth
a0516f76ab Merge "Add cc_library_headers support to bp2build." 2021-02-17 08:57:19 +00:00
Chih-hung Hsieh
3fd84d16cf Merge "Switch to clang-r412851 (build 7141649)" am: 296b7b8440 am: 691531855f am: 59ce34ec85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76993c683386449fe64675a8490fbb70bd2d5041
2021-02-17 02:08:49 +00:00
Chih-hung Hsieh
296b7b8440 Merge "Switch to clang-r412851 (build 7141649)" 2021-02-17 00:17:14 +00:00
Elliott Hughes
0beaf98c71 Merge "Rename __ANDROID_UNGUARDED_AVAILABILITY__ -> __ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__." am: 9f53de289e am: 9be8ed2681 am: 486450a014
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1584291

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I553ed1a322abb18ee8777c722530ff323b6742d9
2021-02-16 23:18:03 +00:00
Rupert Shuttleworth
54e7841b90 Add cc_library_headers support to bp2build.
Test: Added cc_conversion_test.go.
Change-Id: Id4459d2c2fa02687a374cd9fb25d687e9678218c
2021-02-16 23:07:01 +00:00
Chih-Hung Hsieh
6338deba1d Switch to clang-r412851 (build 7141649)
Bug: 179065588
Test: presubmit
Change-Id: Ifb9399e9f4ec0968b174b90c1a1f4f78f903d39d
2021-02-12 13:53:10 -08:00
Chih-Hung Hsieh
9f94c362ea Change default DEFAULT_TIDY_HEADER_DIRS to empty
* Default -header-filter will now contain only module directory.
  * In a clean build of aosp_x86_64-eng, this change can reduce
    the number of (duplicated) clang-tidy warnings by 77% or more.
* When compiled with WITH_TIDY=1, if DEFAULT_TIDY_HEADER_DIRS is
  not set, warnings from a header file will be shown only if
  the file is in a module's (sub)directory.
* Set DEFAULT_TIDY_HEADER_DIRS="bionic/|bootable/|build/|cts/|\
  dalvik/|developers/|development/|frameworks/|\
  libcore/|libnativehelper/|system/"
  will get before this change's -header-filter.
* Fix a bug: Default header-filter was not added when
  tidy_flags was defined in a module.
  With this fix, some incorrectly hidden header file tidy warnings
  will now show up.

Bug: 179530304
Test: make with WITH_TIDY=1 and various setting of DEFAULT_TIDY_HEADER_DIRS
Change-Id: Ia0c05349908a730862dae36be9a2dbe4f44fb6da
2021-02-12 13:50:38 -08:00
Elliott Hughes
5add0c61d6 Rename __ANDROID_UNGUARDED_AVAILABILITY__ -> __ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__.
Bug: http://b/179067538
Test: treehugger
Change-Id: I5945ca6e767212280a1981e6f78ec3c50acfb3f3
2021-02-11 14:21:59 -08:00
Treehugger Robot
fbc7b966a2 Merge "Add LOCAL_LICENSE_KINDS to build/soong" am: b68036f44b am: 0a1087f291 am: 66a854d585
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1575543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb7ac70ed37be73b84da59f8e1ad88daea3bfa80
2021-02-10 09:28:19 +00:00
Treehugger Robot
b68036f44b Merge "Add LOCAL_LICENSE_KINDS to build/soong" 2021-02-10 07:18:29 +00:00
Treehugger Robot
709a2ab213 Merge "Ensure that stubs.symbol_file has ".map.txt" suffix" am: 509ab03f12 am: 1950b77215 am: f2db4bc32c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574808

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08d432f551eb509cd847c6f9c27edc5067d9b73c
2021-02-10 01:47:07 +00:00
Jose "Pepe" Galmes
c7566be823 Merge "Implement directed recovery snapshot." am: ee4dcdc0ad am: ab1e7cc897 am: 34c5caff4e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1581563

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8c598d817ea88980bc734afe469acc72984470d
2021-02-10 01:45:57 +00:00
Treehugger Robot
1950b77215 Merge "Ensure that stubs.symbol_file has ".map.txt" suffix" am: 509ab03f12
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574808

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8a69aef4b1fc5a2518460224707e724519c1ec0
2021-02-10 01:21:41 +00:00
Treehugger Robot
509ab03f12 Merge "Ensure that stubs.symbol_file has ".map.txt" suffix" 2021-02-10 01:07:30 +00:00
Jose "Pepe" Galmes
ab1e7cc897 Merge "Implement directed recovery snapshot." am: ee4dcdc0ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1581563

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If399d2d14df5a163662e857430a449c8be02503b
2021-02-10 00:28:34 +00:00
Jose "Pepe" Galmes
ee4dcdc0ad Merge "Implement directed recovery snapshot." 2021-02-10 00:02:34 +00:00
Benjamin Schwartz
aeda6e49f4 powerstats: PowerStats HAL has been renamed am: 71dfb344e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1576505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I755bd9fc0a79730c95ab1d7596e868f156d492fb
2021-02-09 22:21:30 +00:00
Benjamin Schwartz
725482b4ab Create Power Stats AIDL interface am: 1057ccb75a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1576504

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89b2061a22bfe2bd449917066354937277085846
2021-02-09 22:20:58 +00:00
Treehugger Robot
609b124e5e Merge changes from topic "ps 2.0 cp"
* changes:
  Update VndkMustUseVendorVariantList
  powerstats: PowerStats HAL has been renamed
  Create Power Stats AIDL interface
2021-02-09 19:20:10 +00:00
Jose Galmes
4c6895e5a3 Implement directed recovery snapshot.
Bug: 177451657
Test: m -j nothing
Change-Id: I0b84c34fb2e9e9340d9f9e7405428cd2cc4d43b5
2021-02-09 08:25:34 -08:00
Ivan Lozano
f5de1a6146 Merge "rust: Add rust_ffi_static vendor ramdisk Support" am: 4ccfcc2ee4 am: 86af4b576f am: 325c8526b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1578523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89309e092a56bd53a5ae7bbe999a91a7c5f0a8e8
2021-02-09 15:44:32 +00:00
Ivan Lozano
4ccfcc2ee4 Merge "rust: Add rust_ffi_static vendor ramdisk Support" 2021-02-09 13:49:28 +00:00
Ivan Lozano
e6d3098c1b rust: Add rust_ffi_static vendor ramdisk Support
Similar to our vendor support, this adds support for linking rust static
libraries to vendor ramdisk cc modules.

A bug fix is also included where a restriction against setting rust_ffi
vendor-specific was not being enforced.

Bug: 179397942
Test: Example modules link, Soong tests pass.
Change-Id: I737cdf0c2f49ab349bcea2a0429e6298ebc1313e
2021-02-08 09:36:26 -05:00
Bob Badour
02040de891 Add LOCAL_LICENSE_KINDS to build/soong
Added SPDX-license-identifier-Apache-2.0 to:
  Android.bp
  android/Android.bp
  android/soongconfig/Android.bp
  androidmk/Android.bp
  apex/Android.bp
  bazel/Android.bp
  bp2build/Android.bp
  bpf/Android.bp
  bpfix/Android.bp
  cc/Android.bp
  cc/config/Android.bp
  cc/libbuildversion/Android.bp
  cc/libbuildversion/tests/Android.bp
  cc/ndk_api_coverage_parser/Android.bp
  cc/ndkstubgen/Android.bp
  cc/symbolfile/Android.bp
  cmd/dep_fixer/Android.bp
  cmd/diff_target_files/Android.bp
  cmd/extract_apks/Android.bp
  cmd/extract_jar_packages/Android.bp
  cmd/extract_linker/Android.bp
  cmd/fileslist/Android.bp
  cmd/host_bionic_inject/Android.bp
  cmd/javac_wrapper/Android.bp
  cmd/merge_zips/Android.bp
  cmd/multiproduct_kati/Android.bp
  cmd/path_interposer/Android.bp
  cmd/pom2bp/Android.bp
  cmd/pom2mk/Android.bp
  cmd/sbox/Android.bp
  cmd/soong_build/Android.bp
  cmd/soong_env/Android.bp
  cmd/soong_ui/Android.bp
  cmd/zip2zip/Android.bp
  cmd/zipsync/Android.bp
  cuj/Android.bp
  dexpreopt/Android.bp
  dexpreopt/dexpreopt_gen/Android.bp
  env/Android.bp
  etc/Android.bp
  filesystem/Android.bp
  finder/Android.bp
  finder/cmd/Android.bp
  genrule/Android.bp
  jar/Android.bp
  java/Android.bp
  java/config/Android.bp
  kernel/Android.bp
  linkerconfig/Android.bp
  linkerconfig/proto/Android.bp
  makedeps/Android.bp
  partner/Android.bp
  phony/Android.bp
  python/Android.bp
  python/tests/Android.bp
  remoteexec/Android.bp
  rust/Android.bp
  rust/config/Android.bp
  scripts/Android.bp
  sdk/Android.bp
  sh/Android.bp
  shared/Android.bp
  symbol_inject/Android.bp
  symbol_inject/cmd/Android.bp
  sysprop/Android.bp
  tradefed/Android.bp
  ui/build/Android.bp
  ui/logger/Android.bp
  ui/metrics/Android.bp
  ui/metrics/proc/Android.bp
  ui/status/Android.bp
  ui/terminal/Android.bp
  ui/tracer/Android.bp
  xml/Android.bp
  zip/Android.bp
  zip/cmd/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
  finder/fs/Android.bp
  third_party/zip/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work

Change-Id: Ia47ca14f16b8c9f84f9d533a07e5b00e2c04e8d4
2021-02-06 04:23:21 +00:00
Jooyung Han
42fe5a7251 Merge "cc: fix version macro for stubs" am: 7701309889 am: 1a90279656 am: ec3a7c5db0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I607d6dd16636e367c43f491eed4e3461e7c48004
2021-02-06 03:06:35 +00:00
Jooyung Han
7701309889 Merge "cc: fix version macro for stubs" 2021-02-06 01:41:31 +00:00
Jose "Pepe" Galmes
9e2ea6ab6d Merge "Generate fake versions of modules excluded in directed vendor snapshot." am: c64b961708 am: 504904f063 am: a05d6919cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1572856

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I106e382c504c59c7028c2b7a3e32b11a93d01822
2021-02-05 19:28:43 +00:00
Jose "Pepe" Galmes
c64b961708 Merge "Generate fake versions of modules excluded in directed vendor snapshot." 2021-02-05 17:54:48 +00:00
Jose Galmes
0a942a0368 Generate fake versions of modules excluded in directed vendor snapshot.
When using the directed vendor snapshot, the build fails because soong
fails to find some variants of the modules that have been excluded
from VENDOR_SNAPSHOT_MODULES, even though those modules are not going
to be used by the build.

The solution implemented here is to generate fake versions of those
modules (empty files) and include them in the generated Android.bp,
so that soong finds the modules, even though trying to use them would
fail.

Bug: 171821997
Bug: 179275601

Test: source build/envsetup.sh
Test: m -j nothing

Change-Id: Ibd3e963ab3e5504c0ac817f7cabbd241bf47a5cb
2021-02-05 17:53:53 +00:00