Commit Graph

19547 Commits

Author SHA1 Message Date
Automerger Merge Worker
577f77c33e Merge "Build rules for compat config docs generation." am: 026ffecb9d am: 5467f3b9ba am: 78ec3d4b73
Change-Id: Iadaab6a5c196e7633a782dcbbaad928798270328
2020-02-04 17:01:33 +00:00
Automerger Merge Worker
78ec3d4b73 Merge "Build rules for compat config docs generation." am: 026ffecb9d am: 5467f3b9ba
Change-Id: Ic94a0b41057c2ce0ef296bdd83c884b0c22efe64
2020-02-04 16:48:47 +00:00
Automerger Merge Worker
5467f3b9ba Merge "Build rules for compat config docs generation." am: 026ffecb9d
Change-Id: I832fad0fd29c99f08118863c7b771a92ac46a585
2020-02-04 16:39:04 +00:00
Anna Trostanetski
026ffecb9d Merge "Build rules for compat config docs generation." 2020-02-04 16:28:40 +00:00
Mathew Inwood
abd49ab4df Build rules for compat config docs generation.
We add a compat config build rule to extract the merged config, and
then update the droiddoc build rule to consume that.

Test: m -j offline-sdk-docs
Bug: 144927670
Change-Id: Ib1e85f97895c89227882e665572bda9bfc2a8cba
Exempt-From-Owner-Approval: ag/10097965 approved internally, Colin requested to patch to aosp
2020-02-04 16:28:22 +00:00
Automerger Merge Worker
f36215b3f5 Merge changes from topic "expose-system-test" am: 1b57531573 am: 364fbba51e am: 9462495940
Change-Id: I670fe7ce6ce8412b4db8ba8c778fff713c3c891f
2020-02-04 08:56:39 +00:00
Automerger Merge Worker
0a18203451 java_sdk_library_import - expose system and test stubs am: 56d4490d59 am: 914c7e38ad am: 5fd7242dea
Change-Id: I3aaca8b8f30e9dcb6096a6dc6e0adaed15838a6a
2020-02-04 08:56:36 +00:00
Automerger Merge Worker
9462495940 Merge changes from topic "expose-system-test" am: 1b57531573 am: 364fbba51e
Change-Id: I1270a8c27b0f0ec4d11b32cae300618378f28c46
2020-02-04 08:44:18 +00:00
Automerger Merge Worker
5fd7242dea java_sdk_library_import - expose system and test stubs am: 56d4490d59 am: 914c7e38ad
Change-Id: I7b514a7f855f366dddb2f95bed078c0f5a34452d
2020-02-04 08:44:15 +00:00
Automerger Merge Worker
364fbba51e Merge changes from topic "expose-system-test" am: 1b57531573
Change-Id: I449bc12e63fbb23ae0fb48973c179da0403a1314
2020-02-04 08:34:18 +00:00
Automerger Merge Worker
914c7e38ad java_sdk_library_import - expose system and test stubs am: 56d4490d59
Change-Id: Ic3c8c2519001405cd004214e52a4685d9bd68657
2020-02-04 08:34:15 +00:00
Paul Duffin
1b57531573 Merge changes from topic "expose-system-test"
* changes:
  Remove legacy properties from java_sdk_library_import
  java_sdk_library_import - expose system and test stubs
2020-02-04 08:26:30 +00:00
Automerger Merge Worker
49a412c027 [automerger skipped] Merge "Build native coverage variant of APEXes when needed" into qt-dev am: abc4f820a1 am: 8ee870a540 -s ours am: 785b894230 -s ours
am skip reason: Change-Id I97bcee9bf8ffc0dc71453abbdb613ed56ea2cdb4 with SHA-1 ee9a98d88e is in history

Change-Id: Ia43cc357b443a2f8ea376d3a357031561273e83e
2020-02-04 01:06:48 +00:00
Automerger Merge Worker
785b894230 [automerger skipped] Merge "Build native coverage variant of APEXes when needed" into qt-dev am: abc4f820a1 am: 8ee870a540 -s ours
am skip reason: Change-Id I97bcee9bf8ffc0dc71453abbdb613ed56ea2cdb4 with SHA-1 ee9a98d88e is in history

Change-Id: Ia5d33ac1024e73611e074059626eb582245bef07
2020-02-04 01:00:44 +00:00
Automerger Merge Worker
8ee870a540 Merge "Build native coverage variant of APEXes when needed" into qt-dev am: abc4f820a1
Change-Id: Id11c85eb9c5dea8a43486a70409ae370d1faa938
2020-02-04 00:54:27 +00:00
TreeHugger Robot
abc4f820a1 Merge "Build native coverage variant of APEXes when needed" into qt-dev 2020-02-04 00:43:58 +00:00
Automerger Merge Worker
5af05cc080 Merge "Disable no-vendor-variant VNDK for CFI modules" am: 6cee077b0b am: 4e702abe65 am: 24f82725ab
Change-Id: Ic852d1d25cff79aa7d0574428ef84d62dc304de9
2020-02-03 21:44:09 +00:00
Automerger Merge Worker
24f82725ab Merge "Disable no-vendor-variant VNDK for CFI modules" am: 6cee077b0b am: 4e702abe65
Change-Id: Ia78a3947360801a79e22ccf6e2b100df3b7cfcf7
2020-02-03 21:32:06 +00:00
Automerger Merge Worker
4e702abe65 Merge "Disable no-vendor-variant VNDK for CFI modules" am: 6cee077b0b
Change-Id: Ibfc2a4a49b7934e58191b688f27350250f995dbd
2020-02-03 21:23:27 +00:00
Vic Yang
6cee077b0b Merge "Disable no-vendor-variant VNDK for CFI modules" 2020-02-03 21:09:47 +00:00
Automerger Merge Worker
bfc675528b Merge "Update NDK ABIs config away from armv5." am: dcbc329713 am: 1a62566c9f am: b7b6c9a067
Change-Id: Ib9e3c740389138454a647162e56b7fd5e8c95dda
2020-02-03 21:01:16 +00:00
Automerger Merge Worker
b7b6c9a067 Merge "Update NDK ABIs config away from armv5." am: dcbc329713 am: 1a62566c9f
Change-Id: Ic95b5b338e61b13d4296b68156aeeccd4c429da2
2020-02-03 20:47:31 +00:00
Automerger Merge Worker
1a62566c9f Merge "Update NDK ABIs config away from armv5." am: dcbc329713
Change-Id: I5fcfdde775092c430747aa6501190ba315b0eff6
2020-02-03 20:35:36 +00:00
Treehugger Robot
dcbc329713 Merge "Update NDK ABIs config away from armv5." 2020-02-03 20:28:41 +00:00
Automerger Merge Worker
47d9337298 [automerger skipped] Wrap getenv when linking a coverage-enabled binary am: c2cf2c5dbe am: 8d8639d5f5 -s ours am: 35183b68be -s ours
am skip reason: Change-Id If58081a12b2b9bc40cfcbf64c99beafe198d07af with SHA-1 100bbdc8f3 is in history

Change-Id: Ia737936440769d2051014ea72dc2bb076c69394f
2020-02-03 19:48:59 +00:00
Automerger Merge Worker
42efe8dd99 [automerger skipped] Refactor libprofile-extras to be added as a whole static library am: 2363a2b162 am: 1cb0535e41 -s ours am: 4a400d1724 -s ours
am skip reason: Change-Id I7e7d8201956a150febbda5bb1794f8ece016db8b with SHA-1 82fe59b656 is in history

Change-Id: Icb59e5bf0f45a1731615d0ff1cc8ec7dc7903256
2020-02-03 19:48:57 +00:00
Automerger Merge Worker
2cdee535e9 [automerger skipped] Package coverage files as a zip. am: baa54c6ed8 am: 3756ab8460 -s ours am: 605d01bf82 -s ours
am skip reason: Change-Id I955212a20ea19c854ebc88635252a1d174ea8f7f with SHA-1 c743414d42 is in history

Change-Id: Ifd1b31f8b46b071dab51ba96070475d456569b4e
2020-02-03 19:47:26 +00:00
Automerger Merge Worker
35183b68be [automerger skipped] Wrap getenv when linking a coverage-enabled binary am: c2cf2c5dbe am: 8d8639d5f5 -s ours
am skip reason: Change-Id If58081a12b2b9bc40cfcbf64c99beafe198d07af with SHA-1 100bbdc8f3 is in history

Change-Id: I344d1904dcec0ece2eba7155979cb550c0406475
2020-02-03 19:33:14 +00:00
Automerger Merge Worker
4a400d1724 [automerger skipped] Refactor libprofile-extras to be added as a whole static library am: 2363a2b162 am: 1cb0535e41 -s ours
am skip reason: Change-Id I7e7d8201956a150febbda5bb1794f8ece016db8b with SHA-1 82fe59b656 is in history

Change-Id: I80276633aab5703819f604885242b434eddbe6aa
2020-02-03 19:33:12 +00:00
Automerger Merge Worker
605d01bf82 [automerger skipped] Package coverage files as a zip. am: baa54c6ed8 am: 3756ab8460 -s ours
am skip reason: Change-Id I955212a20ea19c854ebc88635252a1d174ea8f7f with SHA-1 c743414d42 is in history

Change-Id: I0fb8f969747caf903c47859ebf94e0e225fbe7d7
2020-02-03 19:31:28 +00:00
Automerger Merge Worker
8d8639d5f5 Wrap getenv when linking a coverage-enabled binary am: c2cf2c5dbe
Change-Id: I0cc628c5672e3c7565fc3f0250bb45f0c62cedad
2020-02-03 19:14:00 +00:00
Automerger Merge Worker
1cb0535e41 Refactor libprofile-extras to be added as a whole static library am: 2363a2b162
Change-Id: Ic7b0c632eed10248906eb5a36a40f7afa1c659ce
2020-02-03 19:13:58 +00:00
Automerger Merge Worker
3756ab8460 Package coverage files as a zip. am: baa54c6ed8
Change-Id: I6c9890781efb0eb2a0667d1e8e22c06a07411aaa
2020-02-03 19:13:16 +00:00
Pirama Arumuga Nainar
c2cf2c5dbe Wrap getenv when linking a coverage-enabled binary
The wrapper to getenv() appends the effective userid (euid) of the
current process to GCOV_PREFIX.  This avoids conflicts and permissions
issues when multiple processes try to create/access the same directories
and files under /data/misc/trace.

Bug: 148178774
Test: Verify that coverage files are written to
/data/misc/trace/<euid>/proc/... instead of /data/misc/trace/proc/...

Change-Id: If58081a12b2b9bc40cfcbf64c99beafe198d07af
Merged-In: If58081a12b2b9bc40cfcbf64c99beafe198d07af
(cherry picked from commit 100bbdc8f3)
2020-02-03 19:04:09 +00:00
Pirama Arumuga Nainar
2363a2b162 Refactor libprofile-extras to be added as a whole static library
Bug: http://b/134177005
Bug: http://b/116873221

Previously, the libprofile-extras dependency was added as a
LateStaticLib and the constructor in this library was included during
linking with the '-uinit_profile_extras' linker flag.  This was done
because at the deps() stage, the exact binaries that need coverage are
not known (in fact the coverage-enabled variants are not created yet).

This meant that for a link command, if one of the shared libraries
already exported the constructor, the output of the link command did not
load/link libprofile-extras.

For other reasons, we now want to add more symbols to this library that
need to be linked into all libraries and executables.  To accomplish
that, refactor the dependency handling so libprofile-extras can be added
as a 'WholeStaticLib'.

This is done by creating a new dependency type (with a coverageDepTag
dependency tag) to add libprofile-extras as a dependency for all modules
that can potentially link with coverage.  During the flags() call, this
dependency is moved as a WholeStaticLib dependency iff coverage is
enabled in this link step.

There are a few NFC changes as well:
- deps() takes a DepsContext parameter.
- flags() has an extra PathDeps parameter and return value.
- add useSdk() helper to cc.Module.

Test: Build with coverage and check that we can generate coverage using
SIGUSR1 and the debug.coverage.flush sysprop.

Change-Id: I7e7d8201956a150febbda5bb1794f8ece016db8b
Merged-In: I7e7d8201956a150febbda5bb1794f8ece016db8b
(cherry picked from commit 82fe59b656)
2020-02-03 19:03:45 +00:00
Oliver Nguyen
baa54c6ed8 Package coverage files as a zip.
Bug: 148178774
Test: make NATIVE_COVERAGE=true COVERAGE_PATHS="*"
Change-Id: I955212a20ea19c854ebc88635252a1d174ea8f7f
Merged-In: I955212a20ea19c854ebc88635252a1d174ea8f7f
(cherry picked from commit c743414d42)
2020-02-03 19:00:22 +00:00
Automerger Merge Worker
5426c89024 Merge "Switch to r370808b." am: ab2053ffab am: ee7726901a am: 1d6ab48772
Change-Id: I424662a5968b93d6a3e180db34a0631731f17d4f
2020-02-03 18:37:23 +00:00
Automerger Merge Worker
1d6ab48772 Merge "Switch to r370808b." am: ab2053ffab am: ee7726901a
Change-Id: Id1da5a3d86a22d95bfe9a4e179718b33405b113b
2020-02-03 18:27:08 +00:00
Automerger Merge Worker
fbcc073910 Merge "Export the cert path for runtime_resource_overlay." am: 411a98a917 am: f0c7ebd377 am: bd91f26447
Change-Id: Ic956708566076e769ffb4aafc0d02664f070a823
2020-02-03 18:22:02 +00:00
Automerger Merge Worker
ee7726901a Merge "Switch to r370808b." am: ab2053ffab
Change-Id: I03d421aad9017a4aa5c1f48745a40a46837c1179
2020-02-03 18:15:40 +00:00
Automerger Merge Worker
bd91f26447 Merge "Export the cert path for runtime_resource_overlay." am: 411a98a917 am: f0c7ebd377
Change-Id: I38ee0490a3e7593ae5491a90cb2859fe3025a09c
2020-02-03 18:09:35 +00:00
Stephen Hines
ab2053ffab Merge "Switch to r370808b." 2020-02-03 18:06:41 +00:00
Automerger Merge Worker
f0c7ebd377 Merge "Export the cert path for runtime_resource_overlay." am: 411a98a917
Change-Id: I03577d5c70c4f7c73f67be6b3266ca1df4543947
2020-02-03 17:57:00 +00:00
Jaewoong Jung
411a98a917 Merge "Export the cert path for runtime_resource_overlay." 2020-02-03 17:43:46 +00:00
Paul Duffin
56d4490d59 java_sdk_library_import - expose system and test stubs
Previously, the java_sdk_library_import only exposed the public stubs.
This change adds support for exposing system and test stubs too by adding
separate structures for public, system and test scopes. The existing
properties are kept for legacy reasons (and because libs can be common
across the differents scopes).

It extracts some code that is common to both sdk library and sdk
library import.

The legacy support will be removed in a future change once all existing
usages have been switched over.

Bug: 148080325
Test: m droid
      TARGET_BUILD_APPS=Camera2 m
Change-Id: I0b26cc8af9ee044437ff3b80c1eca611816b9386
2020-02-03 15:58:08 +00:00
Paul Duffin
fcfd79166c Remove legacy properties from java_sdk_library_import
The legacy usages have all been updated so the legacy properties
can be safely removed. The Libs property is kept so it can be used to
specify properties common to all scopes.

Bug: 148080325
Test: m droid
      TARGET_BUILD_APPS=Camera2 m

Change-Id: I252ebbedbb463db3c7346e86d86b5880eea76fe9
2020-02-03 15:58:08 +00:00
Automerger Merge Worker
91ce795278 Merge "Script to set up android build directory" am: db84575f84 am: 7059136aec am: 9813b33a88
Change-Id: I20b205270b1f91e2b766812d0a2ad5c499fe5fb5
2020-02-01 23:41:09 +00:00
Automerger Merge Worker
9813b33a88 Merge "Script to set up android build directory" am: db84575f84 am: 7059136aec
Change-Id: I11390f38dde7557355dd99ea2ba5b65380879333
2020-02-01 23:32:39 +00:00
Automerger Merge Worker
7059136aec Merge "Script to set up android build directory" am: db84575f84
Change-Id: Ia02df714f1516f65a997b26e4995ac0cfaa8e4d0
2020-02-01 23:23:44 +00:00
Treehugger Robot
db84575f84 Merge "Script to set up android build directory" 2020-02-01 23:08:27 +00:00