Commit Graph

17268 Commits

Author SHA1 Message Date
Martin Stjernholm
0233e754e8 Merge "Move generation of the dexpreopt tool paths into Soong."
am: 46f60291f3

Change-Id: If56caa31ed5ae470a4ff67ca42937c9da0c26cf8
2020-01-08 03:02:16 -08:00
Martin Stjernholm
46f60291f3 Merge "Move generation of the dexpreopt tool paths into Soong." 2020-01-08 10:40:28 +00:00
Steven Moreland
bd7203e66d Merge "vibrator: use package as name"
am: 4b662e4d3b

Change-Id: I361b82925978469ecac6afb5e3fccf7bdbbd2b3c
2020-01-07 14:48:38 -08:00
Steven Moreland
4b662e4d3b Merge "vibrator: use package as name" 2020-01-07 22:43:01 +00:00
Yi Kong
e8c2eb1f83 Merge "Support sampling PGO profiles"
am: 563e3a4f95

Change-Id: I08c0936c28ae8b6e64f946b242801e96e6a7a292
2020-01-07 14:21:12 -08:00
Yi Kong
563e3a4f95 Merge "Support sampling PGO profiles" 2020-01-07 22:18:12 +00:00
Colin Cross
400665159a Delay invalid sdk_version error for AllowMissingDependencies
am: 07c8856904

Change-Id: I166f7174b51c59b152123b5cdf7fd5ba464307d2
2020-01-07 12:19:16 -08:00
Colin Cross
07c8856904 Delay invalid sdk_version error for AllowMissingDependencies
Unbundled builds set AllowMissingDependencies and attempt to use
prebuilts for some jars.  Delay the errors for missing jars for
modules with invalid sdk_version values in unbundled builds so
that they only block the build if those modules are built.

Also fix some error messages to show the original sdk_version
value.

Bug: 146513037
Test: m TARGET_BUILD_APPS=Camera2
Change-Id: I1812ef6dc80895f7a2162a8bdbf2c5067755e9a0
2020-01-07 20:14:14 +00:00
Martin Stjernholm
c52aaf11d0 Move generation of the dexpreopt tool paths into Soong.
The dexpreopt global config is now split into the part that is generated
from make (in build/make/core/dex_preopt_config.mk) and the part that is
generated from Soong. Since the goal is to generate the dex2oat path from
Soong dependencies, the old GlobalConfig.Tools struct is simply repurposed
for the Soong generated config, although the intention is to allow more
settings to migrate from make to Soong, and hence from GlobalConfig to
GlobalSoongConfig.

Since the new dexpreopt_soong.config is written from a Soong-created ninja
rule, it doesn't need to be rewritten to out/soong/<device>/ like the old
make-created config file.

Test: m
Test: env USE_DEX2OAT_DEBUG=false m
  (check that out/soong/dexpreopt_soong.config points to dex2oat instead of dex2oatd)
Bug: 145934348

Change-Id: Ifd45c4a08e2ec55b86f4a93f0d85bd39cf2cf189
2020-01-07 14:15:42 +00:00
Ulyana Trafimovich
540d35006f Merge "Respect JIT-zygote config when generating boot image location."
am: 99d522b5df

Change-Id: I7810e1734b8e49047077720c6a5ab5c9e53a92c0
2020-01-07 03:01:06 -08:00
Ulyana Trafimovich
99d522b5df Merge "Respect JIT-zygote config when generating boot image location." 2020-01-07 10:48:45 +00:00
Dan Shi
75b879c30b Merge "Pass auto_gen_config setting in Android.bp to makefile"
am: 13f30ae38c

Change-Id: I5154d020a016b27c08e966b55974d08dae50bed5
2020-01-07 00:00:51 -08:00
Dan Shi
13f30ae38c Merge "Pass auto_gen_config setting in Android.bp to makefile" 2020-01-07 06:23:04 +00:00
Jiyong Park
05d981334f Merge changes from topic "carry_required"
am: 64d5ccef7a

Change-Id: I825a9fa4cc330f2604de4807cb0f242fb8be1239
2020-01-06 20:08:09 -08:00
Jiyong Park
3d0ec3d20b *RequiredModuleNames functions are available via Module interface
am: 6a8cf5fab4

Change-Id: Ia3aa6bd2780f7770c2798c6ff95f0e826b1ea165
2020-01-06 20:08:05 -08:00
Jiyong Park
40a301a80e Merge "Remove unused system_modules"
am: 9a3f61cd43

Change-Id: If8f7d8c55caa7a842e84f1571b67a35cbe015f06
2020-01-06 20:05:07 -08:00
Treehugger Robot
64d5ccef7a Merge changes from topic "carry_required"
* changes:
  APEX carries required properties of its dependencies
  *RequiredModuleNames functions are available via Module interface
2020-01-07 03:51:29 +00:00
Treehugger Robot
9a3f61cd43 Merge "Remove unused system_modules" 2020-01-07 03:51:09 +00:00
Dan Shi
2468d015fe Pass auto_gen_config setting in Android.bp to makefile
Bug: none
Test: local test with fuzzy_fastboot
Change-Id: I2c62f6fb58737538ef9e1e9fcbe63e03dfa7ee91
2020-01-06 16:21:10 -08:00
Colin Cross
d6f80608ae Merge changes from topic "blueprint_scoped_module_factories"
am: e35ff4aeb3

Change-Id: Ic8e054d5e964fa37ce2bbac0d849dde1fb85e777
2020-01-06 14:49:09 -08:00
Colin Cross
a5b7784ba6 Use blueprint.EarlyModuleContext
am: c34d2329b4

Change-Id: Ie41ca741c76698c9f3eec3d086b1f8ed38c8750c
2020-01-06 14:48:55 -08:00
Colin Cross
e35ff4aeb3 Merge changes from topic "blueprint_scoped_module_factories"
* changes:
  Use blueprint's load hooks
  Use blueprint.EarlyModuleContext
2020-01-06 22:45:44 +00:00
Steven Moreland
9dbe4035ef vibrator: use package as name
In order to provide a more descriptive name, and to be consistent
with HIDL, the stable AIDL package names are switching from
vintf-vibrator format to the package format
(android.hardware.vibrator).

Bug: N/A
Test: all build time
Change-Id: Ie6580714c3d09c1f99808ca9f8dc7875487f1049
Merged-In: Ie6580714c3d09c1f99808ca9f8dc7875487f1049
2020-01-06 14:08:00 -08:00
Dan Willemsen
7ef5d07452 Merge "Allow EMMA_INSTRUMENT_FRAMEWORK during ninja"
am: a62862bd08

Change-Id: I324c0019f900b502f3d557f6c215bab010eda7f6
2020-01-06 14:03:56 -08:00
Colin Cross
ea83ab5ecc Merge "Add EarlyModuleContext for LoadHookContext"
am: 7d20c4407c

Change-Id: I3d1e6358d50b805b3d451551376aa757f1e1e53a
2020-01-06 14:00:54 -08:00
Treehugger Robot
a62862bd08 Merge "Allow EMMA_INSTRUMENT_FRAMEWORK during ninja" 2020-01-06 21:59:31 +00:00
Treehugger Robot
7d20c4407c Merge "Add EarlyModuleContext for LoadHookContext" 2020-01-06 21:43:03 +00:00
Dan Willemsen
5cacfe1e24 Allow EMMA_INSTRUMENT_FRAMEWORK during ninja
This is used by the art apex test.

Bug: 147197813
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true art-check-debug-apex-gen
Change-Id: Id185cd35f16131f2c9a8afeba2e5b87834b0e620
2020-01-06 12:25:40 -08:00
Colin Cross
31a738bda0 Use blueprint's load hooks
Make android.AddLoadHook wrap blueprint.AddLoadHook.  Also pass
the config object to ParseBlueprintsFiles.

Test: all soong tests
Change-Id: I60c988b717d395f52498ec23ef7c9046d9861a6e
2020-01-06 10:57:26 -08:00
Colin Cross
c34d2329b4 Use blueprint.EarlyModuleContext
Make android.EarlyModuleContext wrap blueprint.EarlyModuleContext

Test: m checkbuild
Change-Id: I5e05c4f3dfb177811bc244a5cc2d71f42e47613b
2020-01-06 10:57:24 -08:00
Paul Duffin
6307388229 Merge "Verify APIs are compatible with last released api by default"
am: a1af29ae4d

Change-Id: Ibb21802b03b102264d506b8ccd529e2dd34ac888
2020-01-06 09:01:51 -08:00
Treehugger Robot
a1af29ae4d Merge "Verify APIs are compatible with last released api by default" 2020-01-06 16:43:29 +00:00
Mathew Inwood
a8da239ade Merge "Singleton build rule for merged compat config."
am: ac65c69913

Change-Id: I52067dc0e6a718473ab3914bc0b96d822d6a4d5e
2020-01-06 08:42:58 -08:00
Matthew Maurer
276274e8e8 Merge "Update rustc version to 1.40.0"
am: 30d4876861

Change-Id: I8b6f4814398500a4d54bf0411122f4c4fbfc9a3d
2020-01-06 08:35:43 -08:00
Mathew Inwood
ac65c69913 Merge "Singleton build rule for merged compat config." 2020-01-06 16:32:54 +00:00
Treehugger Robot
30d4876861 Merge "Update rustc version to 1.40.0" 2020-01-06 16:18:39 +00:00
Ulya Trafimovich
3391a1e85f Respect JIT-zygote config when generating boot image location.
Earlier CL Ida40dfae8c83bf7c2e737d5c7ea418e1197ad826 introduced
Soong-generated Make variable 'DEXPREOPT_IMAGE_LOCATIONS'. That CL was
erroneous in that it did not take JIT-zygote config into account and
generated identical location for "boot" and "apex" boot images.

This caused build breakages, because in case of JIT-zygote config the
two variables 'DexPreoptImages' and 'DexPreoptImageLocations' in the
module's dexpreopt.config were out of sync: 'DexPreoptImages' was
for the "apex" image, and 'DexPreoptImageLocations' was for the "boot"
image.

CL I9a91fc48e54d7d43abec2cb2b5a11e3581db380b introduced a workaround
for this problem: incorrect 'DexPreoptImageLocations' from the module
dexpreopt.config was ignored, and instead boot image location was
manually reconstructed from 'DexPreoptImages'. This workaround would
not work when we start using boot image extension and location will
become more complex.

This CL fixes the way 'DexPreoptImageLocations' is generated by
spliting the 'DEXPREOPT_IMAGE_LOCATIONS' variable in two variables
depending on the boot image flavour "boot" of "apex". This is
aligned with the way other similar variables are generated.

Test: aosp_walleye-userdebug boots.
Test: walleye_jitzygote-userdebug builds
  (on git_rvc-release branch with this CL cherry-picked).

Change-Id: I93415227564522bce4250d281d561e708a022101
2020-01-06 16:01:55 +00:00
Paul Duffin
a465e435c2 Verify APIs are compatible with last released api by default
Previously, the checking of the current API for compatibility with the
previously released API was only enabled for a white list of targets
which included api-stubs-docs and system-api-stubs-docs. This change
replaces the white list of targets to check with a black list of targets
not to check so that the checks are performed by default.

The black list currently consists only of android.car-system-stubs-docs.

Bug: 134485888
Bug: 123222452
Test: m checkapi with an incompatible conscrypt API
Change-Id: I3b48b6cfb61e1f39d74fc48d9d2c0415f886d959
2020-01-06 15:19:02 +00:00
Jiyong Park
7afd1077b8 APEX carries required properties of its dependencies
When a module is included in an APEX and the module is not directly
installed to the system partition, the 'required' property of the module
is lost. The APEX containing the module now carries the property from
its dependencies.

Bug: 146549048
Test: m
Change-Id: Ie21cc7b8420c6126c855e66c2363644de4a7ef42
2020-01-06 10:41:46 +09:00
Jiyong Park
6a8cf5fab4 *RequiredModuleNames functions are available via Module interface
...so that the required module names can be known to other modules

Bug: N/A
Test: m
Change-Id: Ib032b51c4ea4fd77bdebcf09b2d1c2aec1c8eb27
2020-01-06 10:35:58 +09:00
Paul Duffin
786d41db85 Merge "java_sdk_library: Ensure that stubs library is not installed"
am: 17cf0ab3bc

Change-Id: I5c34740e8d41d42339ed424b2e0bd609486ce54d
2020-01-05 11:03:16 -08:00
Treehugger Robot
17cf0ab3bc Merge "java_sdk_library: Ensure that stubs library is not installed" 2020-01-05 19:01:10 +00:00
Paul Duffin
603cad0d9f Merge "java_sdk_library: Allow creation of impl shared library to be disabled"
am: bcb6041b2a

Change-Id: Iaab845ed1b6fc1982b73dbb318fa3fb9b0db89d4
2020-01-05 10:28:44 -08:00
Treehugger Robot
bcb6041b2a Merge "java_sdk_library: Allow creation of impl shared library to be disabled" 2020-01-05 18:26:27 +00:00
Paul Duffin
7da6648137 Merge "java_sdk_library: Allow api dir to be specified"
am: 7e96dac325

Change-Id: I51d8ba247b78d202c25a773c0aca3c23a08c24d5
2020-01-05 09:01:18 -08:00
Treehugger Robot
7e96dac325 Merge "java_sdk_library: Allow api dir to be specified" 2020-01-05 16:49:27 +00:00
Dan Willemsen
7c1427389e Likely fix SANITIZE_HOST=address builds
am: 7da042912b

Change-Id: If9fbca37706c6a12aa5431b60d43326703b3e077
2020-01-04 16:27:21 -08:00
Dan Willemsen
7da042912b Likely fix SANITIZE_HOST=address builds
We're passing in ASAN_OPTIONS=detect_leaks=0 on the command line, and
the build started failing after we limited the environment.

Test: forrest of aosp-master/aosp_x86_64-eng
Change-Id: I42c91897c7677e1a249412e5a8bc7bb1edb2f881
2020-01-04 13:58:54 -08:00
Dan Willemsen
8c296553c0 Merge "Limit environment during ninja"
am: 2de4152e61

Change-Id: If73c043555ecf19a81afeb23f52ed7e9d80ba2e5
2020-01-04 09:54:27 -08:00
Dan Willemsen
2de4152e61 Merge "Limit environment during ninja" 2020-01-04 17:51:03 +00:00