Commit Graph

3295 Commits

Author SHA1 Message Date
Colin Cross
dec157bd6c Merge changes I545a832a,I85a51b04 am: 54956abf1f
am: 2f27762373

Change-Id: Ib0b19484d9e0481c24c2da4f47c56e5d167fe1e1
2019-02-04 09:57:50 -08:00
Colin Cross
2f27762373 Merge changes I545a832a,I85a51b04
am: 54956abf1f

Change-Id: Ieb7d59d1593807cb1b02b820dfed08a25bf441b6
2019-02-04 09:51:57 -08:00
Colin Cross
54956abf1f Merge changes I545a832a,I85a51b04
* changes:
  Remove empty DepsMutator methods
  Replace *[]string with []string in product variables
2019-02-04 17:38:05 +00:00
Kostya Kortchinsky
d0ed8fd59d Add option to disable Scudo globally [Soong]
This adds an option in Soong to turn off Scudo globally.

Bug: 123228023
Test: enable Scudo for tombstoned, lunch marlin_svelte-eng && m -j, and
make sure that Scudo is not linked in
out/target/product/marlin/system/bin/tombstoned
Test: enable Scudo for tombstoned, lunch marlin-userdebug && m -j, and
make sure that Scudo is linked in
out/target/product/marlin/system/bin/tombstoned

Change-Id: I0b0992446953fc4074bde94507b66f92764c8143
2019-02-04 15:43:21 +00:00
Yi Kong
b5c34d7f40 Use llvm-{strip,objcopy} by default
... except for Darwin Mach-O, as it is not supported by llvm-strip.

Test: m checkbuild
Bug: 119221035
Change-Id: I021637b6dd3530bff1f563f2ec7c2168e1083b7e
2019-02-04 18:20:28 +08:00
Jiyong Park
adb6afbf0b Use bootstrap linker for asan build am: a2aca28750 am: 03f7c2110c
am: 3e07ecd3ec

Change-Id: I07f93958bd33eb38e51ffb845baea1c5fc8373a5
2019-02-03 07:45:24 -08:00
Jiyong Park
3e07ecd3ec Use bootstrap linker for asan build am: a2aca28750
am: 03f7c2110c

Change-Id: I8aff17397c03c11ffc8bf380e99a6f22e732b9b2
2019-02-03 07:41:18 -08:00
Jiyong Park
03f7c2110c Use bootstrap linker for asan build
am: a2aca28750

Change-Id: I6b45d6863a72be558fda41faf4ac1d315f1066e1
2019-02-03 07:37:16 -08:00
Jiyong Park
a2aca28750 Use bootstrap linker for asan build
This change the asan version of
https://android-review.googlesource.com/c/platform/build/soong/+/879237

Bug: 123725034
Test: forrest run on asan_cf_x86_pasan
Test: SANITIZE_TARGET=address m init_second_stage
inspect /system/bin/init with readelf
DT_INTERP is set to /system/bin/bootstrap/linker_asan

Change-Id: I0fabe08cc63126aadec18ca8e9f2973c33411a4f
2019-02-02 13:28:57 +09:00
Evgenii Stepanov
99ef1573ee [hwasan] Remove deprecated compiler flag (NFC) am: 93c3f5368d am: a60c43aa23
am: f69f7ccea0

Change-Id: I5872f7af2a86b35a8aa85a165ed05690125e7abb
2019-02-01 19:04:49 -08:00
Evgenii Stepanov
f69f7ccea0 [hwasan] Remove deprecated compiler flag (NFC) am: 93c3f5368d
am: a60c43aa23

Change-Id: I291e86f0a08d03026bb563159f75d1d5d258845f
2019-02-01 19:00:45 -08:00
Evgenii Stepanov
a60c43aa23 [hwasan] Remove deprecated compiler flag (NFC)
am: 93c3f5368d

Change-Id: I0f2de3a2db53d8a2a963711aaae4fe1a53407ee3
2019-02-01 18:56:43 -08:00
Colin Cross
5f692ec219 Remove empty DepsMutator methods
Add an empty DepsMutator to ModuleBase so it doesn't have to be
implemented on every module that doesn't need it.

Test: all soong tests
Change-Id: I545a832a0dbf27386d3080377a75ea482cd9ce59
2019-02-01 17:17:58 -08:00
Evgenii Stepanov
93c3f5368d [hwasan] Remove deprecated compiler flag (NFC)
-hwasan-with-ifunc=0 matches the default value of the flag, and there
are no plans to change that.

Test: SANITIZE_TARGET=hwaddress keeps working
Change-Id: Ie46ffa6ae3c42a9677c3a9a3b5cdc6fb62c2c2f0
2019-02-01 22:56:03 +00:00
Pirama Arumuga Nainar
2933c50de6 Merge "Switch to clang-r349610" am: 42b87a2e56 am: 8edd1c3632
am: 06b240368e

Change-Id: I22b72f4a260e0438248da7a1401b61a49b1dc26a
2019-02-01 12:14:22 -08:00
Pirama Arumuga Nainar
06b240368e Merge "Switch to clang-r349610" am: 42b87a2e56
am: 8edd1c3632

Change-Id: I92713c576b5c9c9bf7ee16d0016c0f9aa495a3e7
2019-02-01 11:27:22 -08:00
Pirama Arumuga Nainar
8edd1c3632 Merge "Switch to clang-r349610"
am: 42b87a2e56

Change-Id: If67d4fd64234ae0ab727556121a6a4cc21941631
2019-02-01 11:07:54 -08:00
Pirama Arumuga Nainar
42b87a2e56 Merge "Switch to clang-r349610" 2019-02-01 16:49:36 +00:00
Jiyong Park
cb8dad1830 Merge "Fix: runtime apex is not instrumented with sanitizer" am: 101d7600b2 am: 7581398376
am: 6bf77f3ab4

Change-Id: Ie4cd37eeff2c8003c5881f9e070c47517a84fbf8
2019-01-31 22:03:44 -08:00
Jiyong Park
6bf77f3ab4 Merge "Fix: runtime apex is not instrumented with sanitizer" am: 101d7600b2
am: 7581398376

Change-Id: I48a87d35e7779265afb1938f761673608ff91f06
2019-01-31 21:56:40 -08:00
Jiyong Park
7581398376 Merge "Fix: runtime apex is not instrumented with sanitizer"
am: 101d7600b2

Change-Id: I836b00a51dce1626de7f3c01cb349d080a62801f
2019-01-31 21:52:36 -08:00
Jiyong Park
5c11fc3f0c Add unstrippedOutputFilePath to the linker interface am: af6d895941 am: 837c1c1e31
am: dd070fb200

Change-Id: I46d5f3ca118ab5440ecbd8141bacb50b2960652b
2019-01-31 21:46:37 -08:00
Treehugger Robot
101d7600b2 Merge "Fix: runtime apex is not instrumented with sanitizer" 2019-02-01 05:45:22 +00:00
Jiyong Park
dd070fb200 Add unstrippedOutputFilePath to the linker interface am: af6d895941
am: 837c1c1e31

Change-Id: Iffe272e5ac3f571b7767d54e880c1f42b487c9da
2019-01-31 21:43:33 -08:00
Jiyong Park
837c1c1e31 Add unstrippedOutputFilePath to the linker interface
am: af6d895941

Change-Id: If00bdc8e45c6f29a8a760ec3edd297d1db2c73a3
2019-01-31 21:38:29 -08:00
Jiyong Park
8222663f1b Fix: runtime apex is not instrumented with sanitizer
Fixing the problem that IsSanitizerEnabled always returns false due to
the different sanitizer names from config.SanitizerDevice() and
sanitizerType.String().

Bug: 123708856
Test: SANITIZE_TARGET=hwaddress m com.android.runtime.release
$ ls -al out/soong/.intermediates/art/build/apex/com.android.runtime.release/android_common_hwasan_com.android.runtime.release/image.apex/lib | wc -l
34
$ ls -al out/soong/.intermediates/art/build/apex/com.android.runtime.release/android_common_hwasan_com.android.runtime.release/image.apex/lib64 | wc -l
35
$ ls -al out/target/product/blueline/apex/com.android.runtime.release/lib | wc -l
34
$ ls -al out/target/product/blueline/apex/com.android.runtime.release/lib64 | wc -l
35

Test: inspect out/soong/build.ninja
- Variant of com.android.runtime.release is "android_common_hwasan_com.android.runtime.release"
- Dependencies of com.android.runtime.release are hwasan variants: e.g.,
  out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-2a_kryo385_core_shared_hwasan_com.android.runtime.release/libc.so

Test: ls out/soong/.intermediates/art/build/apex/com.android.runtime.release/android_common_hwasan_com.android.runtime.release/image.apex/lib64/*.so  | xargs readelf -d | grep libclang_rt.hwasan | wc -l
29

Change-Id: Idbb1f68a3ea6bdd02351d6f6048c3eedb9cf32d2
2019-02-01 11:26:04 +09:00
Jiyong Park
af6d895941 Add unstrippedOutputFilePath to the linker interface
Test: m
Change-Id: I85a0cbda6ebb9838451ed8c607c2087460b7b742
2019-02-01 11:04:58 +09:00
Ivan Lozano
f68200d308 Merge "XOM dependency check skipping static binaries." am: 2ccd9b83d0 am: 054d752f4a
am: 33c1d15591

Change-Id: I68ba9e5057318e02ba0d286fd3d5d0da78561e3a
2019-01-31 14:02:58 -08:00
Ivan Lozano
33c1d15591 Merge "XOM dependency check skipping static binaries." am: 2ccd9b83d0
am: 054d752f4a

Change-Id: I1d553df12891c101fd5265083b9482ab685f3645
2019-01-31 13:57:03 -08:00
Ivan Lozano
054d752f4a Merge "XOM dependency check skipping static binaries."
am: 2ccd9b83d0

Change-Id: I002f77ac5d41856f3a19ac4505ca5ee292a6d4d1
2019-01-31 13:50:33 -08:00
Treehugger Robot
2ccd9b83d0 Merge "XOM dependency check skipping static binaries." 2019-01-31 21:42:42 +00:00
Ivan Lozano
59a7ae9bdf XOM dependency check skipping static binaries.
The execute-only memory dependency check is skipped for static binaries.
Make sure we check dependencies in this case.

Bug: 123603191
Test: readelf on static binary with xom-incompatible dependencies
Change-Id: I7ddd3058811cdf4e9cf862163e1bf5add4981b32
2019-01-31 10:09:13 -08:00
Pirama Arumuga Nainar
03b58e2210 Switch to clang-r349610
Bug: http://b/122481018

The '-keep' option of llvm-strip has changed to '-keep-section'.  Update
scripts/strip.sh accordingly.

Test: Tested on various targets in AOSP and internal branch.  Googlers
      see http://go/clang-r349610-testing
Change-Id: Ibfc97ecdcdc305c97a4169cead1e1e3cddda9c4c
2019-01-31 16:32:34 +00:00
Victor Chang
bf14aed6d9 exclude_shared_libs should exlude headers in {static|shared}.export_*_lib_headers am: 51271c1fb4 am: d48fd64691
am: 9103612cb3

Change-Id: I01e9d181f5fe4bdde8e9a04f06f1f5be3d3c0a17
2019-01-31 03:25:38 -08:00
Victor Chang
9103612cb3 exclude_shared_libs should exlude headers in {static|shared}.export_*_lib_headers am: 51271c1fb4
am: d48fd64691

Change-Id: Ibc088de6e5792c64a434c89066a47750fe9db630
2019-01-31 03:21:35 -08:00
Victor Chang
d48fd64691 exclude_shared_libs should exlude headers in {static|shared}.export_*_lib_headers
am: 51271c1fb4

Change-Id: I57a019a97078ebabfc8809b022bd29c35bbf8f06
2019-01-31 03:14:31 -08:00
Victor Chang
51271c1fb4 exclude_shared_libs should exlude headers in {static|shared}.export_*_lib_headers
Bug: 122882789
Test: m droid vts
Change-Id: I33ec75fa908e557eeadc91c5ca1a5e180bc9f31b
2019-01-31 11:05:03 +00:00
Jiyong Park
2e75cd27b2 "bootstrap: true" modules are using bootstrap Bionic am: a4b9dd08c0 am: 356278b9fa
am: 67e52ef256

Change-Id: I5ba4624db185d6955d2fac4d3f4802f251f4dd8e
2019-01-30 21:25:11 -08:00
Jiyong Park
d7f8fddd47 bootstrap bionic are moved to ./bootstrap subdir am: 429660f3c8 am: e9601d6446
am: 1f67ac48b7

Change-Id: I36b85c3d416093183cd4eaf66f74a95daf9b8383
2019-01-30 21:24:56 -08:00
Jiyong Park
67e52ef256 "bootstrap: true" modules are using bootstrap Bionic am: a4b9dd08c0
am: 356278b9fa

Change-Id: Ib071e7632d603238e9f101e4dc561f487433a5b2
2019-01-30 21:08:55 -08:00
Jiyong Park
1f67ac48b7 bootstrap bionic are moved to ./bootstrap subdir am: 429660f3c8
am: e9601d6446

Change-Id: I64318b907a0ae7531bd5f236152f661ea2f09e15
2019-01-30 21:08:42 -08:00
Jiyong Park
356278b9fa "bootstrap: true" modules are using bootstrap Bionic
am: a4b9dd08c0

Change-Id: Ifbed24778563452c2a8bf821fa02d59fe2b2a9ca
2019-01-30 20:55:49 -08:00
Jiyong Park
e9601d6446 bootstrap bionic are moved to ./bootstrap subdir
am: 429660f3c8

Change-Id: Iae5d9adb9ed3177f99958688ecd601713d186675
2019-01-30 20:55:40 -08:00
Jiyong Park
a4b9dd08c0 "bootstrap: true" modules are using bootstrap Bionic
If the bootstrap property is set to true, a binary configured to refer
to the bootstrap linker at /system/bin/bootstrap/linker[64]. This is for
very early processes that are executed before the init makes the linker
by bind-mounting it.

Bug: 120266448
Test: m init_second_stage and use readelf on the built file
DT_INTERP is set to /system/bin/bootstrap/linker64 and

Change-Id: I67487701192f127679cc8127ddc9f53e102ba9c4
2019-01-31 13:44:20 +09:00
Jiyong Park
429660f3c8 bootstrap bionic are moved to ./bootstrap subdir
Bootstrap bionic (the bionic in the system partition that is for the
early processes before the runtime APEX is ready) is now located under
./bootstrap subdirectory. i.e.,
* /system/lib[64]/bootstrap/lib{c|dl|m}.so

Before this change, the bootstrap bionic were self bind-mounted. This is
causing problem with `adb sync` because the path which is a mount point
couldn't be unlinked and thus rewriting is not done.

Now, the mount points and mount sources are clearly separated.

Bug: 120266448
Test: m libc.bootstrap libm.bootstrap libdl.bootstrap
Following files are found under system and recovery/root/system
./lib[64]/bootstrap/libc.so, libdl.so, libm.so

Change-Id: I90399b3181988814ce07875df8c1a36599f3337f
2019-01-31 13:44:20 +09:00
Logan Chien
8964f8a8cf Merge "Add a header_abi_checker section" am: 4c20135b19 am: cf6869990c
am: de7c431ad1

Change-Id: I19851be7b5e624c7aeada7f6a72022c54bd391c2
2019-01-30 19:12:31 -08:00
Logan Chien
de7c431ad1 Merge "Add a header_abi_checker section" am: 4c20135b19
am: cf6869990c

Change-Id: Icde8e896cda9a91c36c12562918a9da010580852
2019-01-30 18:37:09 -08:00
Logan Chien
cf6869990c Merge "Add a header_abi_checker section"
am: 4c20135b19

Change-Id: I414a82c81c1c874595668e2a2c2da74b0cb3dda0
2019-01-30 18:19:56 -08:00
Logan Chien
4c20135b19 Merge "Add a header_abi_checker section" 2019-01-31 02:05:51 +00:00
Jiyong Park
ee0311f628 Fix: deps to sanitizer runtime libs are with correct 'image' variant am: 3b1746a212 am: dc9872a0d3
am: c4843f1d9f

Change-Id: Id9faa6e4af38ea6cd80ac7c58c55e4fdeb04889f
2019-01-30 09:47:40 -08:00