Commit Graph

3527 Commits

Author SHA1 Message Date
dimitry
51ea18a437 Skip native_bridge modules when installing vndk snapshot
Do not install natively bridged libraries as part of vndk snapshot.

Bug: http://b/77159578
Test: Enable 4arch build -> make
Change-Id: I519ef92ca356ee6438abb3c85fa639af2170c2ef
2019-05-23 13:35:13 +02:00
dimitry
db41747c8b Fix override for native_bridge modules
Native_bridge modules should override only native_bridge modules
and not regular ones.

Bug: http://b/77159578
Test: make 4-arch product
Change-Id: I79d96736082397abeb36d653840679a7aa0edbf5
2019-05-23 13:35:13 +02:00
dimitry
4320449c97 Apply native_bridge suffix to all cc_modules
This fixes the problem with cc_object not having this suffix and
as a result overriding non-bridged variants for modules using mk files.

Bug: http://b/77159578
Test: build 4arch product
Change-Id: Ie958f997c6f54f93d8b2987ca5ba605004e1eb70
2019-05-23 13:31:10 +02:00
Jooyung Han
a579e144c6 Merge "soong: fix wrong link type for VNDKs" am: 18bb34d633
am: b0aca51ad6

Change-Id: I87f4534284f563a58e8b4f0777a9f68d9a451c14
2019-05-23 03:20:17 -07:00
Colin Cross
a78a8691d6 Merge "Cut darwinStripPool from 10 to 5" am: ecca61f0f2
am: bf96a947f1

Change-Id: I7ccd87d793f0451568f4ef27371fc32d7fd2f8ea
2019-05-23 03:17:43 -07:00
Treehugger Robot
18bb34d633 Merge "soong: fix wrong link type for VNDKs" 2019-05-23 07:32:24 +00:00
Yi Kong
2fc3248b6b Enable the experimental LLVM new pass manager
For walleye, the overall binary size is decreased by ~1.1%.

For Googlers, http://go/android-llvm-newpm

Test: build
Bug: 131855431
Change-Id: I6726cd3de0d528b773fb23eae1a7c5c360e29807
2019-05-23 07:17:27 +00:00
Jooyung Han
380029182c soong: fix wrong link type for VNDKs
Do not rely on 'module.Name()' to decide VNDK link type.
Some prebuilt modules such as libclang_rt_prebuilt_library_shared and
vndk_prebuilt may have different naming schemes.(prefix/suffix)
And llndk_library module has '.llndk' suffix.

Instead, use VNDK-related properties (e.g. vndk.enabled,
vendor_available, etc.).

Bug: 132800095
Test: m & check LOCAL_SOONG_LINK_TYPE for prebuilts
Change-Id: I06b0c182aeab16969c44a86397f02be4beb80bbd
2019-05-23 12:24:51 +09:00
Colin Cross
badf8d691f Cut darwinStripPool from 10 to 5
Failures in strip.sh are still occurring with darwinStripPool set to
10, try 5.

Bug: 132822437
Test: none
Change-Id: I2df247c89b6d8f6e741d4e17057b06ff9ec72b40
2019-05-23 02:09:07 +00:00
Peter Collingbourne
dcd2ddfc7e Restore the test for bionic being in an APEX. am: 49a25cbc7c am: 34acae298d am: 51e434c8d3
am: e9945dc81c

Change-Id: Idd10d9913163cc2e803b79a9005e4f6504a28b19
2019-05-22 09:18:36 -07:00
Peter Collingbourne
51e434c8d3 Restore the test for bionic being in an APEX. am: 49a25cbc7c
am: 34acae298d

Change-Id: Iea6a09d95f04bcc4715cb35907e3d00aa7f81e88
2019-05-22 01:14:22 -07:00
Christopher Ferris
3ccba5a94b Merge "Add an option to preserve symbols and debug_frame." am: 8a7469a0d7 am: 0361ccc398 am: 6ac2ce2433
am: 7488d70bbe

Change-Id: I73f3c3ebc97eaf149fbc695b713179868b831c98
2019-05-21 21:34:14 -07:00
Peter Collingbourne
49a25cbc7c Restore the test for bionic being in an APEX.
This was removed in
https://android-review.googlesource.com/c/platform/build/soong/+/950885
because it appeared that bionic was always in an APEX, but apparently the
ART host tests have bionic outside of an APEX.

Test: art/test/testrunner/run_build_test_target.py -j50 art-linux-bionic-x64
Change-Id: I0b99462e8636da53c87f9250093689aaaf9ea695
2019-05-21 16:15:29 -07:00
Christopher Ferris
6ac2ce2433 Merge "Add an option to preserve symbols and debug_frame." am: 8a7469a0d7
am: 0361ccc398

Change-Id: I0243a02b8b83b3cd33d9680d531cdd14dcc650a1
2019-05-21 15:41:20 -07:00
Christopher Ferris
8a7469a0d7 Merge "Add an option to preserve symbols and debug_frame." 2019-05-21 18:09:08 +00:00
Peter Collingbourne
26746c7901 Merge "Teach soong not to duplicate the HWASAN runtime into each APEX." am: 90b6561d5d am: 369f315575 am: e690f5894e
am: 5ae0b342f3

Change-Id: I1c0644124f7dcbb0ae008ac21582bd991fbde01d
2019-05-21 01:45:59 -07:00
Jooyung Han
76106d977e exports LOCAL_SOONG_VNDK_VERSION for VNDK libs
For vndk_prebuilt_shared module, it is set by 'version' property.
For other vndk libs(e.g. cc_library with vndk.enabled), it is set as
PLATFORM_VNDK_VERSION.

Background:
To support "skip installing current VNDK".

You can get a system.img without current VNDK libs.
This may help when you want a smaller system.img given that the image
will be used with a specific version (not current) of vendor image.

Bug: 132140714
Test: m TARGET_SKIP_CURRENT_VNDK=true && see if current VNDK is not
installed

Change-Id: I1c603efc3e95fe8bdf870f2de91994077899fca7
2019-05-21 14:56:27 +09:00
Peter Collingbourne
e690f5894e Merge "Teach soong not to duplicate the HWASAN runtime into each APEX." am: 90b6561d5d
am: 369f315575

Change-Id: I152a188cf3f2607c1deeaf2993312ee3821eeb81
2019-05-20 21:50:16 -07:00
Peter Collingbourne
90b6561d5d Merge "Teach soong not to duplicate the HWASAN runtime into each APEX." 2019-05-21 02:29:46 +00:00
Colin Cross
b369b35f23 Merge "Limit calls to strip.sh on darwin" am: 288a1e2957 am: 131a9a8dcb am: dd761b255d
am: 50149efadb

Change-Id: I90a3aedfca1a58fb0c780a10fa51019e8e073c43
2019-05-17 21:11:05 -07:00
Colin Cross
1b2bc64be7 Merge changes I3dc3fded,Ic1276329,I6be04dec am: 045f0f1f30 am: 4c18d670df am: 1f547cfaac
am: 5431b2c3c5

Change-Id: I60a6e00730cc3c56158c97d0d61ce3f7e80df69c
2019-05-17 20:45:43 -07:00
Colin Cross
dd761b255d Merge "Limit calls to strip.sh on darwin" am: 288a1e2957
am: 131a9a8dcb

Change-Id: I910226b14dfd2c40c0d0306697128ad98a6bbb34
2019-05-17 20:27:18 -07:00
Colin Cross
35116ceae6 Merge "Support using cc_prebuilt_library_shared with cc_library" am: 77c22bf008 am: e3106ff23d am: 57f3e6c30f
am: c7f7c7b646

Change-Id: I1aa667f5afe3fcbc3170b3d321201fdc61aafdd8
2019-05-17 19:24:37 -07:00
Treehugger Robot
288a1e2957 Merge "Limit calls to strip.sh on darwin" 2019-05-18 01:57:37 +00:00
Colin Cross
1f547cfaac Merge changes I3dc3fded,Ic1276329,I6be04dec am: 045f0f1f30
am: 4c18d670df

Change-Id: I0c32a4d28740aa23c4a8ee90a879b19374f915ed
2019-05-17 18:40:13 -07:00
Christopher Ferris
b43fe7a838 Add an option to preserve symbols and debug_frame.
New strip option named keep_symbols_and_debug_frame, that will keep the
symbols and the .debug_frame. This is meant for use by libc.so only on
arm32. Other libraries might want to use it to keep better unwinding
information on device.

Bug: 132992102

Test: Built libc.so with this option and verified that it contains
Test: the .debug_frame section.
Change-Id: I823a28199dec8316e8b26fe31ff9f17e6b11d406
2019-05-17 17:52:18 -07:00
Colin Cross
57f3e6c30f Merge "Support using cc_prebuilt_library_shared with cc_library" am: 77c22bf008
am: e3106ff23d

Change-Id: I569390897de21972c0b35924326e8073829dfee5
2019-05-17 17:06:11 -07:00
Colin Cross
ee3ea31a24 Limit calls to strip.sh on darwin
strip.sh can use a file descriptor per .o file when run on .a files,
which can hit the system file descriptor limit on darwin.  This
causes failures when manay variants of libgcc_stripped are built
simultaneously.  Put all strip rules on darwin into a pool that
limits them to 10 concurrent processes, which will limit the file
descriptor usage to ~7500.

Fixes: 132822437
Test: no mention of darwinStripPool in out/soong/build.ninja on linux
Test: m libgcc_stripped on darwin
Change-Id: I3d4fbbd8d44d2e9059a79df113ab95336ec2c658
2019-05-17 22:51:00 +00:00
Peter Collingbourne
3478bb2a7f Teach soong not to duplicate the HWASAN runtime into each APEX.
When HWASAN is enabled, the runtime is conceptually part of Bionic (and
mutually depends on it), so it needs to be treated in the same way as the
Bionic libs.

Now there are only two copies of the runtime: the one in
/system/lib64/bootstrap (which won't be used by ordinary processes) and the
one in the runtime APEX.

This reduces the size of the HWASAN system image and fixes an issue where
multiple copies of the HWASAN runtime were being loaded into 64-bit binaries in
APEXes because the linker namespace for the binary is different from the one
for its dependent libraries outside of APEXes. HWASAN only supports loading
one copy of the runtime per process, so this was causing such binaries to
crash on startup.

Change-Id: I228896e193a035e6dfba9f6e28d0b2e12fc163ea
2019-05-17 10:00:39 -07:00
Colin Cross
815daf95b2 Add bpf_test.go to build and fix tests
bpf_test.go was not listed in testSrcs, which meant it was not run
during the build, but ran and failed with go test android/soong/...

Don't redeclare the cc module types and mutators, use exported
functions from cc/testing.go instead, which contain a new
dependency needed by cc modules.

This reapplies I4542640e8ff08e71565ed50617dbe67d86b29b69 after
fixes for mac tests.

Test: m
Test: go test android/soong/...
Change-Id: I3dc3fdedbd7063df4a2e0cadf2a4e0711b1823ad
2019-05-17 08:43:36 -07:00
Colin Cross
9a94287fc9 Move CreateTestContext to cc/testing.go
Allow CreateTestContext to be called by tests in other packages
that need cc modules.

Test: all soong tests
Change-Id: I6be04dec50632baa8cb51e55ba14d0ddc0df60b8
2019-05-17 08:43:36 -07:00
Colin Cross
33b2fb7333 Support using cc_prebuilt_library_shared with cc_library
Allow a cc_prebuilt_library_shared to share the same name as a
cc_library by always creating static and shared variants of
prebuilts so that the variants of the source module are always
a superset of the variants of the target module.

Bug: 131709055
Test: TestPrebuilts
Change-Id: I4afd6d37e6a986d08ad25aee69eca6d994febc6b
2019-05-17 08:40:42 -07:00
Inseob Kim
7de74803e9 Merge "Generate VNDK snapshot with Soong except configs" am: 651f40bbe1 am: 62ca44a36b am: b3ea83a22f
am: 98cf91fec3

Change-Id: I0b0c1ef47132ca64d194c48b1e461b04e81b2f4e
2019-05-16 07:23:45 -07:00
Evgenii Stepanov
140ca320c3 Disable malloc fill in HWASan. am: 2c6484e334 am: 1f513339fc
am: e2bb508133

Change-Id: Ia88e469cec222cc5cb9dc390a7c7d2904629f30b
2019-05-15 19:39:05 -07:00
Inseob Kim
b3ea83a22f Merge "Generate VNDK snapshot with Soong except configs" am: 651f40bbe1
am: 62ca44a36b

Change-Id: I35f356f9590518406a2fd8d1d3c318cf529dad92
2019-05-15 15:38:29 -07:00
Evgenii Stepanov
e2bb508133 Disable malloc fill in HWASan. am: 2c6484e334
am: 1f513339fc

Change-Id: I32a77532fda177572ab64742f3b5d3a051918211
2019-05-15 15:37:19 -07:00
Evgenii Stepanov
6c8b9a0296 Disable malloc fill in HWASan.
am: 2c6484e334

Change-Id: I84cd62a3cc76006c968136b69bf4d88137b2f934
2019-05-15 15:28:45 -07:00
Treehugger Robot
651f40bbe1 Merge "Generate VNDK snapshot with Soong except configs" 2019-05-15 22:13:35 +00:00
Evgenii Stepanov
2c6484e334 Disable malloc fill in HWASan.
HWASan has a feature to fill malloc() memory with non-zero pattern.
This has found a bug or two in the past, but it also keep causing hard
to debug issues. The main problem is lack of diagnostics - use of
pattern-initialized memory is not an immediate crash. More often than
not it manifests as a subtle change in system behavior.

Having MemorySanitizer on Android would be nice...

This change does not affect any shipping configuration, but improves
stability of testing-only SANITIZE_TARGET=hwaddress build.

Bug: 132803232
Bug: 132652537
Bug: 131438232
Bug: 132810685
Test: SANITIZE_TARGET=hwasan on crosshatch successfully boots in ~100%
      attempt (up from ~99% currently).

Change-Id: I7dcbcdf1b8a5b8556e32690327b32f04879e5db1
2019-05-15 13:53:37 -07:00
Inseob Kim
1f086e2f0d Generate VNDK snapshot with Soong except configs
This is the first commit to generate VNDK snapshot with Soong: .so
files, some txt files, and notice files are captured with Soong. As
ld.config.txt is currently in Android.mk and will be deprecated soon,
configs files (and zipping all of artifacts) are still handled with
Makefile.

Bug: 131564934
Test: 1) DIST_DIR=out/dist development/vndk/snapshot/build.sh
Test: 2) try installing vndk snapshot with:
     development/vndk/snapshot/update.py

Change-Id: I8629e1e25bfc461fd495565bb4872c9af176cf92
2019-05-15 10:26:54 +09:00
Christopher Ferris
248aa4ef5a Merge "Remove libc_scudo library when building asan." am: d7e66d9e7c am: 486b170bbc
am: 422687005a

Change-Id: I2bb484497fe40348211cce7c4990a2c2b991d295
2019-05-13 17:37:09 -07:00
Christopher Ferris
422687005a Merge "Remove libc_scudo library when building asan." am: d7e66d9e7c
am: 486b170bbc

Change-Id: Ifd1c9021bad87c4a74104be311a04ba73a4419b6
2019-05-13 17:30:56 -07:00
Christopher Ferris
d7e66d9e7c Merge "Remove libc_scudo library when building asan." 2019-05-14 00:12:33 +00:00
Sasha Smundak
9755c2970f Merge "Add aaudio, amidi, camera2ndk and nativewindow NDK libraries." am: 95aabdad9c am: f742a23db7
am: 6c0b93509d

Change-Id: If238ad6af62f9bfb8afe25b1f33295845b024022
2019-05-13 12:27:54 -07:00
Sasha Smundak
6c0b93509d Merge "Add aaudio, amidi, camera2ndk and nativewindow NDK libraries." am: 95aabdad9c
am: f742a23db7

Change-Id: I37c42997d43bf9a583d573a1be2d6d0f5428655c
2019-05-13 11:52:34 -07:00
Treehugger Robot
95aabdad9c Merge "Add aaudio, amidi, camera2ndk and nativewindow NDK libraries." 2019-05-13 18:30:33 +00:00
Dimitry Ivanov
ae9e34a687 Merge "Enable native bridge support by default for certain ndk modules" am: 9c9fd4e73a am: 64ad4e8d72
am: f8eb90728a

Change-Id: Ie8289aec5115e7ad66d55eb86f1e010318f7e774
2019-05-10 06:30:42 -07:00
Dimitry Ivanov
f8eb90728a Merge "Enable native bridge support by default for certain ndk modules" am: 9c9fd4e73a
am: 64ad4e8d72

Change-Id: I610996c9aa9a3b6bca8572e939bd4f92958da1d8
2019-05-10 03:39:39 -07:00
Dimitry Ivanov
9c9fd4e73a Merge "Enable native bridge support by default for certain ndk modules" 2019-05-10 08:16:49 +00:00
Inseob Kim
b8a8dbf1fc Merge "Attach global variables to Context" am: a1591ab08c am: 66c5cac22b
am: c012b19eb0

Change-Id: Ie319c254e7ee669d89d280ffb08c6b1eb848e4cc
2019-05-09 22:25:16 -07:00