Steven Moreland
4b662e4d3b
Merge "vibrator: use package as name"
2020-01-07 22:43:01 +00:00
Automerger Merge Worker
88f36d7689
Merge "Support sampling PGO profiles" am: 563e3a4f95 am: e8c2eb1f83
...
Change-Id: I80316b5ca00a50fe7517512adf5417a79d85fa0f
2020-01-07 22:29:15 +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
Automerger Merge Worker
9b47a016ab
Delay invalid sdk_version error for AllowMissingDependencies am: 07c8856904 am: 400665159a
...
Change-Id: Id98a2f3bba00c7a21ab676fd22b9fef9976f7a9b
2020-01-07 20:33:27 +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
Jooyung Han
002ab687ac
Add compat symlinks for prebuilt_apex
...
When prebuilt_apex overrides/replaces other apex, the same symlinks need
to be created as well.
Bug: 143192278
Test: 1. add prebuilt_apex with vndk apex
with overrides set as ["com.android.vndk.current"]
2. m <prebuilt apex>
3. check if vndk symlinks are created
Change-Id: I8ee9c981ea9c7202ccf5143b3f43e6848773cd63
2020-01-08 01:57:58 +09: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
Automerger Merge Worker
09ecf51657
Merge "Respect JIT-zygote config when generating boot image location." am: 99d522b5df am: 540d35006f
...
Change-Id: I5434a38e4fdc5a429bc4f13ea8a4505445a56611
2020-01-07 11:15:26 +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
Automerger Merge Worker
458321b216
Merge "Pass auto_gen_config setting in Android.bp to makefile" am: 13f30ae38c am: 75b879c30b
...
Change-Id: I5ea23eb72f2f8ada15feb5b525c3f0ffbf26319f
2020-01-07 08:21:56 +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
Jiyong Park
58ab941c6c
use symlink for bundled APEX
...
For bundled APEXes, files that are included in the APEX due to
transitive dependencies are replaced with symlinks to the same files in
the system partition. For example, /apex/com.android.art/lib/libbase.so
is a symlink to /system/lib/libbase.so. This is to reduce the
storage/ram overhead of APEXes.
Note that this optimization is done only for bundled APEXes (i.e. APEXes
that are built "WITH" the platform and pre-installed). Unbundled APEXes
(i.e., APEXes for Mainline modules built/signed by Google) are not
affected.
Bug: 144533348
Test: m (test amended)
Change-Id: I1ed21b1d47d93d2b8c296f8f227105031b29afed
2020-01-07 16:03:48 +09:00
Dan Shi
13f30ae38c
Merge "Pass auto_gen_config setting in Android.bp to makefile"
2020-01-07 06:23:04 +00:00
Automerger Merge Worker
ae5c67e016
Merge changes from topic "carry_required" am: 64d5ccef7a am: 05d981334f
...
Change-Id: I1f5650d60ec28bf4c6ba18bf0c597d68a5916e4b
2020-01-07 04:19:41 +00:00
Automerger Merge Worker
823160f504
*RequiredModuleNames functions are available via Module interface am: 6a8cf5fab4 am: 3d0ec3d20b
...
Change-Id: Ide9255b63b2a96ea9443f00df235905743f6a0a4
2020-01-07 04:19:38 +00:00
Automerger Merge Worker
7f560b1cca
Merge "Remove unused system_modules" am: 9a3f61cd43 am: 40a301a80e
...
Change-Id: I46f65a7714362599edbc0251627b17e842ee2c6e
2020-01-07 04:19:17 +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
Automerger Merge Worker
42988b2d48
Merge changes from topic "blueprint_scoped_module_factories" am: e35ff4aeb3 am: d6f80608ae
...
Change-Id: I8cd3ec2384e11639a7808125a6a0aa9e490be078
2020-01-06 23:03:17 +00:00
Automerger Merge Worker
fd259c494d
Use blueprint.EarlyModuleContext am: c34d2329b4 am: a5b7784ba6
...
Change-Id: I85121ddbff667cc591675cbc32ca986fb919efde
2020-01-06 23:03:13 +00: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
Automerger Merge Worker
58e0f20f85
Merge "Allow EMMA_INSTRUMENT_FRAMEWORK during ninja" am: a62862bd08 am: 7ef5d07452
...
Change-Id: I0135eebbc8576bc314779e5639109225334dabcd
2020-01-06 22:16:49 +00:00
Automerger Merge Worker
b089fba01f
Merge "Add EarlyModuleContext for LoadHookContext" am: 7d20c4407c am: ea83ab5ecc
...
Change-Id: I8df411ac02a5a91b7c899e683804e6c6310b95ee
2020-01-06 22:16:27 +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
Automerger Merge Worker
d2418eee24
Merge "Verify APIs are compatible with last released api by default" am: a1af29ae4d am: 6307388229
...
Change-Id: I13eac82f8054e1c53e205468763f41abb5cd2737
2020-01-06 17:02:38 +00:00
Automerger Merge Worker
31263c5079
Merge "Singleton build rule for merged compat config." am: ac65c69913 am: a8da239ade
...
Change-Id: Ib86634f5ac9934cc513d9c3572d4b16216f1d897
2020-01-06 17:02:26 +00: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
Automerger Merge Worker
5107afa615
Merge "Update rustc version to 1.40.0" am: 30d4876861 am: 276274e8e8
...
Change-Id: I61e93b3fd9cc18e9f4d6ed9fa860dc6cd7fb1125
2020-01-06 16:59:40 +00:00
Ulya Trafimovich
4456188939
Include jacoco in the ART boot image if EMMA_INSTRUMENT_FRAMEWORK=true.
...
Test: aosp_walleye-userdebug boots.
Test: Coverage build boots:
$ lunch aosp_walleye-userdebug
$ cd $ANDROID_BUILD_TOP
$ build/soong/soong_ui.bash --make-mode droid \
SKIP_ABI_CHECKS=true \
TARGET_PRODUCT=aosp_walleye \
TARGET_BUILD_VARIANT=userdebug \
EMMA_INSTRUMENT=true \
NATIVE_COVERAGE=true
$ adb reboot bootloader && fastboot flashall -w
Test: Coverage build with framework coverage boots:
$ lunch aosp_walleye-userdebug
$ cd $ANDROID_BUILD_TOP
$ build/soong/soong_ui.bash --make-mode droid \
SKIP_ABI_CHECKS=true \
TARGET_PRODUCT=aosp_walleye \
TARGET_BUILD_VARIANT=userdebug \
EMMA_INSTRUMENT=true \
EMMA_INSTRUMENT_FRAMEWORK=true \
NATIVE_COVERAGE=true
$ adb reboot bootloader && fastboot flashall -w
Test: Static coverage build with framework coverage boots:
$ lunch aosp_walleye-userdebug
$ cd $ANDROID_BUILD_TOP
$ build/soong/soong_ui.bash --make-mode droid \
SKIP_ABI_CHECKS=true \
TARGET_PRODUCT=aosp_walleye \
TARGET_BUILD_VARIANT=userdebug \
EMMA_INSTRUMENT=true \
EMMA_INSTRUMENT_FRAMEWORK=true \
EMMA_INSTRUMENT_STATIC=true \
NATIVE_COVERAGE=true
$ adb reboot bootloader && fastboot flashall -w
Change-Id: Iaa198b8505aaff36e6685559642ff721637ce55f
2020-01-06 16:52:56 +00: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