Commit Graph

21959 Commits

Author SHA1 Message Date
Jaewoong Jung fe576ad672 [automerger skipped] Merge "Make android_app_import multi targets arch module." into rvc-dev am: 4d480bcd0f -s ours
am skip reason: Change-Id I5bbb2d2b733bbd6b868898285683ba5ff45be10b with SHA-1 243688ea1b is in history

Change-Id: I840c08b59f1cfabfe823f6814273abe7e7aa16f3
2020-05-07 15:32:11 +00:00
Jaewoong Jung 4d480bcd0f Merge "Make android_app_import multi targets arch module." into rvc-dev 2020-05-07 15:19:49 +00:00
Treehugger Robot 5dd4e5ecb7 Merge "Remove implicit Bionic and kernel system includes." am: 4779327cf8 am: 6bc155429e
Change-Id: I6d848f25cd90abd31afa9816afd4174d07091304
2020-05-07 13:52:09 +00:00
Treehugger Robot 6bc155429e Merge "Remove implicit Bionic and kernel system includes." am: 4779327cf8
Change-Id: I72a5de7f105d062ca98c3d2d64d62aad2fcbdbb1
2020-05-07 13:44:33 +00:00
Treehugger Robot 4779327cf8 Merge "Remove implicit Bionic and kernel system includes." 2020-05-07 13:35:13 +00:00
Paul Duffin 2f4ca67891 [automerger skipped] java_sdk_library: Define relationship between api scopes am: 51a2bee304 -s ours
am skip reason: Change-Id I163223caed38161ce1fa7b96dc3772194c32c3e2 with SHA-1 97b53b83e4 is in history

Change-Id: If94fdbe0881259ea0212bb794bebc39abc881bf3
2020-05-07 13:02:04 +00:00
Paul Duffin c00b8e85ef [automerger skipped] Add hook to be called after defaults have been applied am: 1b115d32b4 -s ours
am skip reason: Change-Id I13df3115f9e225f7324b6725eaeb16a78cc2538a with SHA-1 afa9fa104d is in history

Change-Id: If85da3292291c60cf41d628b7cd76763ed836929
2020-05-07 13:01:58 +00:00
Paul Duffin afe4c5cee6 [automerger skipped] Move prebuilts mutators after defaults have been applied am: eedf3f1f4a -s ours
am skip reason: Change-Id I825c6df09058fb3a45db196661959eb332aca2f3 with SHA-1 c988c8e202 is in history

Change-Id: I0c15f9380a1f13704cb294203e8f7a4a29fca8ad
2020-05-07 13:01:31 +00:00
Jeongik Cha 13e5d3eeb3 [automerger skipped] Merge "Remove networkstack-aidl-interfaces-unstable-java from the whitelist" am: 9d902cef58 am: 253c607f14 -s ours
am skip reason: Change-Id If5427afb2470a7dffbd418e1c405af508577ad93 with SHA-1 255a570e6d is in history

Change-Id: I704849f1cf04ab8fffb5b0e8f2a0e8a4e5a8ac3b
2020-05-07 11:26:19 +00:00
Jeongik Cha 253c607f14 Merge "Remove networkstack-aidl-interfaces-unstable-java from the whitelist" am: 9d902cef58
Change-Id: I516d5b52588f7d0653835758f9b6073316eb372a
2020-05-07 11:12:50 +00:00
Jeongik Cha 9d902cef58 Merge "Remove networkstack-aidl-interfaces-unstable-java from the whitelist" 2020-05-07 10:59:05 +00:00
Treehugger Robot 9a251975fb Merge "Reduce the number of Soong invocations, and various other minor script fixes." am: d9e4bf9840 am: dd80c5f12c
Change-Id: Ifa46da9c2b97358987f3b84c589aef8541ee42c2
2020-05-07 10:57:48 +00:00
Treehugger Robot dd80c5f12c Merge "Reduce the number of Soong invocations, and various other minor script fixes." am: d9e4bf9840
Change-Id: I52c67cf6ffe83a0759da97e1fa3fca9c2682c695
2020-05-07 10:48:59 +00:00
Paul Duffin 38e4003b44 [automerger skipped] Encapsulate getter into an extractorProperty structure am: 8de6aa4263 -s ours
am skip reason: Change-Id I7e169bd9b6e51b88e35bdf8673a5056337f778c1 with SHA-1 b28369a982 is in history

Change-Id: I5bc9597568346cbcefc683bf6e0e000259abfd7b
2020-05-07 10:48:59 +00:00
Paul Duffin 6494349730 [automerger skipped] Encapsulate properties to be optimized in a container am: f3644f12d0 -s ours
am skip reason: Change-Id Ie83c1ffbb71fd5d7a08d350571dad3e3209b1431 with SHA-1 f34f6d8538 is in history

Change-Id: I6dc31683fc0d71eb00990ae43795c9ed30a4adb6
2020-05-07 10:48:56 +00:00
Paul Duffin 51a2bee304 java_sdk_library: Define relationship between api scopes
Needed for follow up changes.

Test: m checkapi
Bug: 155164730
Merged-In: I163223caed38161ce1fa7b96dc3772194c32c3e2
Change-Id: I163223caed38161ce1fa7b96dc3772194c32c3e2
(cherry picked from commit 97b53b83e4)
2020-05-07 11:37:06 +01:00
Paul Duffin 1b115d32b4 Add hook to be called after defaults have been applied
Previously, the only way for a module type to create modules (other
than defining its own mutator) was to register a LoadHook. However,
that is called before defaults are applied so any properties used in
that hook cannot take advantage of defaults, e.g. java_sdk_library
cannot use defaults to set its sdk_version property and have that
affect its child modules.

This change adds a new SetDefaultableHook() to DefaultableModule to
register a hook that is called after any defaults have been applied.

Also adds some tests to ensure that errors in the visibility property
introduced in a DefaultableHook are reported in the gather phase of
visibility processing.

A follow up change will switch java_sdk_library to use that instead
of the AddLoadHook() mechanism.

Bug: 155295806
Test: m checkapi
Merged-In: I13df3115f9e225f7324b6725eaeb16a78cc2538a
Change-Id: I13df3115f9e225f7324b6725eaeb16a78cc2538a
(cherry picked from commit afa9fa104d)
2020-05-07 11:36:57 +01:00
Treehugger Robot d9e4bf9840 Merge "Reduce the number of Soong invocations, and various other minor script fixes." 2020-05-07 10:36:54 +00:00
Paul Duffin eedf3f1f4a Move prebuilts mutators after defaults have been applied
A follow up change will add a mechanism for a module to register a hook
that is called after any defaults have been applied. That is intended
for use by modules like java_sdk_library that create child modules that
are dependent upon properties that could be supplied by defaults.

Creating those child modules after prebuilts mutators are run will
cause problems if those child modules clash with prebuilts modules.
Moving the prebuilts mutators after the defaults mutators will fix
that.

Tests are currently being run with the mutators in different orders so
this change also cleans that up so they are consistent with the actual
code that is being run.

Bug: 155295806
Test: m checkbuild
Merged-In: I825c6df09058fb3a45db196661959eb332aca2f3
Change-Id: I825c6df09058fb3a45db196661959eb332aca2f3
(cherry picked from commit c988c8e202)
2020-05-07 11:36:44 +01:00
Treehugger Robot e7b784cab5 Merge "java_sdk_library: Define relationship between api scopes" am: aa71638941 am: e04534cd62
Change-Id: I82bb25e87c44e1c32a23b1d0c2bc66ed0b554bb0
2020-05-07 09:51:27 +00:00
Paul Duffin 509bb9b7ff Merge changes I13df3115,I825c6df0 am: 955ade6475 am: 4bfed659d9
Change-Id: I62fc47243b57a0423815f74cd94340f66b897e1d
2020-05-07 09:51:20 +00:00
Treehugger Robot e04534cd62 Merge "java_sdk_library: Define relationship between api scopes" am: aa71638941
Change-Id: Ia704d3ba4157806f8b901f4b54279f4c5525f675
2020-05-07 09:45:36 +00:00
Treehugger Robot aa71638941 Merge "java_sdk_library: Define relationship between api scopes" 2020-05-07 09:37:54 +00:00
Paul Duffin 4bfed659d9 Merge changes I13df3115,I825c6df0 am: 955ade6475
Change-Id: Iba825844a68e1bd42bfc1b6cffb072600573d60c
2020-05-07 09:37:30 +00:00
Paul Duffin 955ade6475 Merge changes I13df3115,I825c6df0
* changes:
  Add hook to be called after defaults have been applied
  Move prebuilts mutators after defaults have been applied
2020-05-07 09:18:26 +00:00
Paul Duffin 8de6aa4263 Encapsulate getter into an extractorProperty structure
Refactors the existing code to wrap a getter with a structure in order
to simplify adding additional per-property information. Adds an
emptyValue field to contain the empty value appropriate for the field
type.

Bug: 155628860
Test: m nothing
Merged-In: I7e169bd9b6e51b88e35bdf8673a5056337f778c1
Change-Id: I7e169bd9b6e51b88e35bdf8673a5056337f778c1
(cherry picked from commit b28369a982)
2020-05-07 09:53:32 +01:00
Paul Duffin f3644f12d0 Encapsulate properties to be optimized in a container
This allows additional metadata to be associated with a set of
properties that will be used in a follow up change to filter
properties that are ignored in some variants (e.g. host variants).

Bug: 155628860
Test: m nothing
Merged-In: Ie83c1ffbb71fd5d7a08d350571dad3e3209b1431
Change-Id: Ie83c1ffbb71fd5d7a08d350571dad3e3209b1431
(cherry picked from commit f34f6d8538)
2020-05-07 09:53:05 +01:00
TreeHugger Robot 0a5fd1a281 [automerger skipped] Merge "Simplify package by using LoadHook instead of mutators" into rvc-dev am: 93f1d81cc0 -s ours
am skip reason: Change-Id Ia8383b9d1272bb12c8a83948753a0e4b0d98a650 with SHA-1 cdfcec98bb is in history

Change-Id: I509ac95c14a376e99859c1bb5d27bf1246d3d787
2020-05-07 07:11:55 +00:00
TreeHugger Robot 93f1d81cc0 Merge "Simplify package by using LoadHook instead of mutators" into rvc-dev 2020-05-07 06:56:29 +00:00
Yo Chiang c746c894b3 Merge "APEX should require base module of stub libraries" am: 6345dfde49 am: f8ae216e9c
Change-Id: Id5c8cb5aa416a3e0cf927067fd2bc2fbf6639128
2020-05-07 06:46:05 +00:00
Yo Chiang f8ae216e9c Merge "APEX should require base module of stub libraries" am: 6345dfde49
Change-Id: Ia137c47464b8bb4ea13ee517c554d75081488f6e
2020-05-07 06:35:22 +00:00
Yo Chiang 6345dfde49 Merge "APEX should require base module of stub libraries" 2020-05-07 06:13:49 +00:00
TreeHugger Robot 67eb8ba040 Merge "Remove networkstack-aidl-interfaces-unstable-java from the whitelist" into rvc-dev am: c40859ae12
Change-Id: Ib0b0b010c4532fc9c5dbcd8c627e54a4ecccbaf4
2020-05-07 06:00:22 +00:00
TreeHugger Robot c40859ae12 Merge "Remove networkstack-aidl-interfaces-unstable-java from the whitelist" into rvc-dev 2020-05-07 05:43:24 +00:00
Jaewoong Jung a689ffe207 Make android_app_import multi targets arch module.
This makes it consistent with android_app. Also, most android_app_import
modules with JNI libs target a single arch.

(This is a cherry-pick change.)

Test: TreeHugger
Bug: 154281342
Change-Id: I5bbb2d2b733bbd6b868898285683ba5ff45be10b
Merged-In: I5bbb2d2b733bbd6b868898285683ba5ff45be10b
2020-05-06 15:19:42 -07:00
Martin Stjernholm 691503ea0b Reduce the number of Soong invocations, and various other minor script fixes.
-  We can pass all targets at once to build-aml-prebuilts.sh.
-  Less noise from build-mainline-modules.sh.
-  Default to the same out directory in both build scripts.
-  Addressed post-submit comments on https://r.android.com/1170907.
-  Various minor cleanups.

Test: build/soong/scripts/build-mainline-modules.sh
Change-Id: Id21ef80c2334462836e217032fc5bf63b7cd04e1
2020-05-06 22:51:15 +01:00
Paul Duffin e7075e83d5 Merge "Encapsulate getter into an extractorProperty structure" am: 97486dbb4b am: bb59252cb2
Change-Id: I870f931d48c05ffe4044c313e103b3fa6ab516d1
2020-05-06 20:41:00 +00:00
Paul Duffin c907eef457 Merge "Encapsulate properties to be optimized in a container" am: 11c91dc141 am: 77a36cdc8a
Change-Id: Idd18c3cd7282582d56f600121b048fb8bce380f5
2020-05-06 20:40:52 +00:00
Paul Duffin bb59252cb2 Merge "Encapsulate getter into an extractorProperty structure" am: 97486dbb4b
Change-Id: I32720b04f935a260dd8a11698569c0aede95d8d1
2020-05-06 20:28:52 +00:00
Paul Duffin 77a36cdc8a Merge "Encapsulate properties to be optimized in a container" am: 11c91dc141
Change-Id: If8a586aa4bced69542ff99cfc5a8dd437645351c
2020-05-06 20:28:44 +00:00
Paul Duffin 97486dbb4b Merge "Encapsulate getter into an extractorProperty structure" 2020-05-06 20:18:39 +00:00
Paul Duffin 11c91dc141 Merge "Encapsulate properties to be optimized in a container" 2020-05-06 20:18:22 +00:00
Makoto Onuki e181e6bcfa [automerger skipped] Merge "Merge the "big 3" metalava invocations into one" am: 574cc84a33 am: 308b257151 -s ours
am skip reason: Change-Id Ia1a5510b57d58748b4655473d4585636deb7f45e with SHA-1 194c43f5a7 is in history

Change-Id: Ia811f37681c1bcbd594ecc2fa3669440094213e9
2020-05-06 19:58:22 +00:00
Makoto Onuki 308b257151 Merge "Merge the "big 3" metalava invocations into one" am: 574cc84a33
Change-Id: I11ae24ed9c5c17c5842ccf71e571ee722ab7d8aa
2020-05-06 19:39:34 +00:00
Makoto Onuki 574cc84a33 Merge "Merge the "big 3" metalava invocations into one" 2020-05-06 19:18:12 +00:00
Martin Stjernholm 41ab2519b4 Remove implicit Bionic and kernel system includes.
They are now explicit in the Bionic blueprints, and brought in through
dependencies on libc (which in turn is usually implicit through the
default system_shared_libs value). Modules that may break are cc_object
which don't depend on system_shared_libs, and those that explicitly set
system_shared_libs:[] but still assumes libc headers. In either case
the fix should be to add header_libs:["libc_headers"].

Test: Build and boot
Test: m checkbuild (on aosp_taimen and aosp_x86_64)
Bug: 153590472
Change-Id: I3217d8f36e49a987f5377866c8647f9dcccc37ce
2020-05-06 19:45:03 +01:00
Paul Duffin b28369a982 Encapsulate getter into an extractorProperty structure
Refactors the existing code to wrap a getter with a structure in order
to simplify adding additional per-property information. Adds an
emptyValue field to contain the empty value appropriate for the field
type.

Bug: 155628860
Test: m nothing
Change-Id: I7e169bd9b6e51b88e35bdf8673a5056337f778c1
2020-05-06 18:40:41 +01:00
Paul Duffin f34f6d8538 Encapsulate properties to be optimized in a container
This allows additional metadata to be associated with a set of
properties that will be used in a follow up change to filter
properties that are ignored in some variants (e.g. host variants).

Bug: 155628860
Test: m nothing
Change-Id: Ie83c1ffbb71fd5d7a08d350571dad3e3209b1431
2020-05-06 18:40:41 +01:00
Paul Duffin 97b53b83e4 java_sdk_library: Define relationship between api scopes
Needed for follow up changes.

Test: m checkapi
Bug: 155164730
Change-Id: I163223caed38161ce1fa7b96dc3772194c32c3e2
2020-05-06 18:40:35 +01:00
Artur Satayev 93649101af [automerger skipped] Introduce min_sdk_version to deps info. am: 388d39ba9a -s ours
am skip reason: Change-Id Ie6568cb8a82d5cca9a3dc91b5a068abf4b0632dc with SHA-1 480e25b74f is in history

Change-Id: Ica60e5a7c4e6a5717e03978e11c21484131b9bab
2020-05-06 17:07:33 +00:00