Commit graph

15011 commits

Author SHA1 Message Date
Pete Bentley
677ba298a5 Merge changes I75b4a761,I779f28c6,If1422372,I26307dd1
am: 792942de47

Change-Id: I48b5288882430733400f897aee1eb76a83fa64c2
2019-08-22 17:32:40 -07:00
Treehugger Robot
792942de47 Merge changes I75b4a761,I779f28c6,If1422372,I26307dd1
* changes:
  Introduce inject_bssl_hash library property.
  BoringSSL FIPS build - introduce extraLibFlags and use for STL libs.
  Allow linker scripts when building objects.
  Allow .o files as srcs.
2019-08-23 00:15:08 +00:00
TreeHugger Robot
c42742c931 Merge "Droiddoc can accept logtags as input sources" into stage-aosp-master 2019-08-22 23:58:28 +00:00
Jooyung Han
0836798f0f Merge "apex: add llndk libs as requireNativeLibs"
am: b020d57003

Change-Id: I9978a5c41fd70a4c5f02b95ac1a079a1ec506584
2019-08-22 14:42:56 -07:00
Treehugger Robot
b020d57003 Merge "apex: add llndk libs as requireNativeLibs" 2019-08-22 21:12:57 +00:00
Pete Bentley
803e161ac9 Introduce inject_bssl_hash library property.
external/boringssl needs to run a tool on a shared library, but
cc_genrules currently don't support shared libraries as inputs
or outputs.  Use a property to trigger the desired behavior for
now.

Bug: 137267623
Test: m libcrypto
Change-Id: I75b4a761f8a4f2c65a99453d2781d6d0f93106ef
2019-08-22 13:21:37 -07:00
Pete Bentley
99f2fc27e6 BoringSSL FIPS build - introduce extraLibFlags and use for STL libs.
Rationale: On non-bionic, stl.go currently adds system libraries to
ldFlags, this causes problems for partialLd rules.  However adding the
same libraries to libFlags breaks some existing modules due to symbol
conflicts as the system libraries are linked before some module code.

Introduced a general mechanism for adding libraries to be linked
last rather than making this STL-specific.

Bug: 134581881
Bug: 137267623
Test: TH
Change-Id: I779f28c6586b3fea85cc6299b686e4fde95262d3
2019-08-22 13:21:37 -07:00
Pete Bentley
74c9bbacb6 Allow linker scripts when building objects.
Test: m nothing
Test: TreeHugger
Bug: 134581881
Bug: 137267623

Change-Id: If1422372585ec032a9e36eab73a04e98fe1c1b6c
2019-08-22 13:21:37 -07:00
Pete Bentley
fcf55bf656 Allow .o files as srcs.
Test: m nothing
Test: TreeHugger
Bug: 134581881
Bug: 137267623

Change-Id: I26307dd1129e58878f0468da3b61c53f074bd674
2019-08-22 13:21:37 -07:00
Yi Kong
e4a824d378 Merge "Switch to clang-r365631"
am: bdefa541d9

Change-Id: I4f8b4e9ce9e0a355b247b11effc5bb1e5ba07f63
2019-08-22 11:56:05 -07:00
Yi Kong
bdefa541d9 Merge "Switch to clang-r365631" 2019-08-22 18:35:54 +00:00
Jiyong Park
4f7dd9b4db Add no_apex property
This change adds 'no_apex' property which, when set to true, prevents
the module from being installed to any APEX. If the module is included
either directly or transitively in an APEX, but build fails.

Bug: 139016109
Test: m

Change-Id: If1478aa9660a3442f7dd1ffe45e4ca5611a6acbe
2019-08-22 20:37:07 +09:00
Jiyong Park
5fbe62a781 Droiddoc can accept logtags as input sources
Bug: 135922046
Test: m
Merged-In: I3fcdc751c91bd762a3fb19b74c1652be1c7ff115
(cherry picked from commit d734c790ce)
Change-Id: I3fcdc751c91bd762a3fb19b74c1652be1c7ff115
2019-08-22 15:06:05 +09:00
Yi Kong
5006a72ec9 Merge "Revert "Re-enable ASAN globals instrumentation for devices.""
am: 20cf012ad1

Change-Id: Ibffe87ad95d7336c9ffdd78eb67fd81ab4b3e1b1
2019-08-21 21:09:52 -07:00
Yi Kong
20cf012ad1 Merge "Revert "Re-enable ASAN globals instrumentation for devices."" 2019-08-22 03:43:51 +00:00
Jiyong Park
d90d7413b7 Droiddoc can accept logtags as input sources
Bug: 135922046
Test: m
Merged-In: I3fcdc751c91bd762a3fb19b74c1652be1c7ff115
Change-Id: I3fcdc751c91bd762a3fb19b74c1652be1c7ff115
2019-08-22 03:41:48 +00:00
Dan Willemsen
485d8af39d Merge "Always set ASAN_SYMBOLIZER_PATH appropriately"
am: 713e1927df

Change-Id: I62cb40cb8a5b6bd4706f55524fc7b21b49b9ffa6
2019-08-21 19:56:21 -07:00
Inseob Kim
60e760e8ac Merge "Implement sysprop_library API stability check" into stage-aosp-master 2019-08-22 02:52:17 +00:00
Treehugger Robot
713e1927df Merge "Always set ASAN_SYMBOLIZER_PATH appropriately" 2019-08-22 02:16:30 +00:00
Yi Kong
da069087bf Revert "Re-enable ASAN globals instrumentation for devices."
This reverts commit cba311bcfc.

The build is actually still broken with ASAN globals instrumentation.
We accidentally suppressed ASAN by turning on the new pass manager and
the build breakage was not discovered.

Bug: 137312732
Bug: 139747256
Change-Id: I8110e1413468c4d760a59a8de816a72c9852a7c8
2019-08-22 00:46:36 +00:00
Dan Albert
d0f9222559 Merge "Link libc++demangle with libc++ for the device."
am: 6f65a20103

Change-Id: I55cebb647f923d19cc98bcb895fc3e6557c69ca1
2019-08-21 17:24:13 -07:00
Treehugger Robot
6f65a20103 Merge "Link libc++demangle with libc++ for the device." 2019-08-21 23:54:48 +00:00
Dan Willemsen
70c1ff8dac Always set ASAN_SYMBOLIZER_PATH appropriately
Otherwise tools built with ASAN can't symbolize their dumps, as
llvm-symbolizer is not allowed to be used from $PATH.

Fixes: 139825736
Test: cherry-pick https://android-review.googlesource.com/c/platform/system/tools/aidl/+/1106532
  mmma ASAN_OPTIONS="" SANITIZE_HOST=address system/tools/aidl
Change-Id: Ib1eeec15ce6694d7bde54c7201b3280e38df3a83
2019-08-21 22:34:11 +00:00
Yi Kong
55d2d90ea4 Merge "Disable new pass manager for ASAN build"
am: 5724333e22

Change-Id: I670af9bab9dca4284420cda4bca5ed5884e7d6a6
2019-08-21 14:47:29 -07:00
Yi Kong
5724333e22 Merge "Disable new pass manager for ASAN build" 2019-08-21 21:11:12 +00:00
Yi Kong
20233a43db Disable new pass manager for ASAN build
ASAN build has some weird issues with the new pass manager, keep using
the legacy pass manager for now.

Test: presubmit
Bug: 139747256
Change-Id: I345afbf6bc4043f274a4e7545a895b59c65641b0
2019-08-21 20:38:51 +00:00
Roland Levillain
79ccffad7d Merge "Rename Soong variable FlattenApex as Flatten_apex."
am: 5f576375fa

Change-Id: I76f5104d5bbcdcbf08919b4acea6ff30179e56a8
2019-08-21 13:13:55 -07:00
Roland Levillain
5f576375fa Merge "Rename Soong variable FlattenApex as Flatten_apex." 2019-08-21 19:55:47 +00:00
Inseob Kim
2f791a246b Implement sysprop_library API stability check
sysprop_library now checks the API stability itself, cutting dependency
on java_sdk_library. Under the directory {module_dir}/api,
{module_name}-current.txt and {module_name}-latest.txt hold API
signatures.

When sysprop_library is built, or a user run "m {module_name}-check-api"
command, API check is performed. First, current.txt must have exactly
same signature with built sysprop_library module. Second, current.txt
must be compatible with latest.txt.

Build system emits a handy error message to generate/update those API
files, in case of missing or mismatching. Also, a script file for
freezing API files is introduced.

Bug: 131637873
Test: 1) m && boot blueline
Test: 2) m {sysprop_library} performs API check
Test: 3) manual test for check-api, freezing api
Change-Id: I9d25f5dc64299e666527ca8e23d7233966901c4e
Merged-In: I9d25f5dc64299e666527ca8e23d7233966901c4e
(cherry picked from commit 093f0eb133)
2019-08-21 02:21:52 +00:00
Jeongik Cha
21cf6f3c2e Merge "Elaborate comment on paltform_apis"
am: 8a6f25be55

Change-Id: I25cbfad8a864d118abfb2c608d0598c17fa32275
2019-08-20 07:52:47 -07:00
Treehugger Robot
8a6f25be55 Merge "Elaborate comment on paltform_apis" 2019-08-20 14:41:03 +00:00
Jooyung Han
9c80baeccf apex: add llndk libs as requireNativeLibs
"use_vendor: true" APEX modules may bundle vendor variants of cc
modules, which can depend on llndk stubs.

In that case, those llndk libraries should be also counted as required
libraries. (stored in 'requireNativeLibs' key in apex_manifest.json)

Bug: 138695532
Test: m nothing (runs soong tests)
Change-Id: If7ad4dec0e723c8d0c73ca60453b555063e14694
2019-08-20 17:30:57 +09:00
Tom Cherry
c1d9880ecc Merge "Add -Wl,--exclude-libs=libclang_rt.builtins to ldflags"
am: 3440835748

Change-Id: Ie9294d87679938ba5453321fa9ce6d7acf45d33f
2019-08-19 13:20:31 -07:00
Tom Cherry
3440835748 Merge "Add -Wl,--exclude-libs=libclang_rt.builtins to ldflags" 2019-08-19 16:39:57 +00:00
Jeongik Cha
356dac4a17 Elaborate comment on paltform_apis
Bug: 132780927
Test: None
Change-Id: If0a4f97ea8f0af0c962fd963daad01adb3e5412f
2019-08-19 14:12:02 +09:00
Jaewoong Jung
7a6bb1d925 Merge "Add arch variant support to android_app_import."
am: a701d9071e

Change-Id: I7e20e0a6f4f0adaec0897fee3a371adcf78106d3
2019-08-16 09:26:58 -07:00
Jaewoong Jung
a701d9071e Merge "Add arch variant support to android_app_import." 2019-08-16 16:01:48 +00:00
Sasha Smundak
9105e8317e Merge "Handle the case when OUT_DIR is not set."
am: dc23131b07

Change-Id: I2922de1e665780db6c4ca65bf837394d637183a8
2019-08-15 18:49:10 -07:00
Treehugger Robot
dc23131b07 Merge "Handle the case when OUT_DIR is not set." 2019-08-16 01:05:41 +00:00
Jaewoong Jung
1ce9ac6755 Add arch variant support to android_app_import.
Bug: 128610294
Fixes: 138792623
Test: app_test.go
Change-Id: I47c80ec283ce58a0ce9b7d0af40844bd73e9d3f1
2019-08-15 16:26:18 -07:00
Colin Cross
31a23c657b Merge "Make javamicro a plugin"
am: fd26de477f

Change-Id: Ibb4cf9da092e3e04275a4d5f441e59d4fb6f9d02
2019-08-15 13:13:46 -07:00
Jaewoong Jung
0018e85876 Merge "Add filename property to android_app_import"
am: da6a7f458b

Change-Id: I328f0d0a22adef9f9e9376019bc674d62233f174
2019-08-15 13:13:28 -07:00
Treehugger Robot
fd26de477f Merge "Make javamicro a plugin" 2019-08-15 18:18:38 +00:00
Sasha Smundak
b13f9c520c Handle the case when OUT_DIR is not set.
Bug: 137977523
Test: manual
Change-Id: I6a4bcc5099223f28bce72bf10004c01327598fc7
2019-08-15 11:13:01 -07:00
Jaewoong Jung
da6a7f458b Merge "Add filename property to android_app_import" 2019-08-15 17:29:55 +00:00
Yi Kong
d255c7bc2f Switch to clang-r365631
Test: build, boot, bionic-unit-test
Test: For Googlers, go/clang-r365631-testing
Bug: 131328001
Change-Id: Ib357d9044a72e41f6bde1e5ec2db34e90706124d
2019-08-15 04:47:34 +00:00
Hsin-Yi Chen
d5c7188d45 Merge "Add tags to the list of lsdump paths"
am: eef3366ab3

Change-Id: Ia08611a0c926ccebfcdbfade31b09878712b82e9
2019-08-14 19:44:45 -07:00
Hsin-Yi Chen
eef3366ab3 Merge "Add tags to the list of lsdump paths" 2019-08-15 02:20:30 +00:00
Jiyong Park
e29e7a870a Merge "Build native coverage variant of APEXes when needed"
am: dcea882ef9

Change-Id: I930078d27e6365f55de7fb77ae58fb538e1aa4f3
2019-08-14 17:43:36 -07:00
Treehugger Robot
dcea882ef9 Merge "Build native coverage variant of APEXes when needed" 2019-08-15 00:08:59 +00:00