Commit Graph

58043 Commits

Author SHA1 Message Date
Martin Stjernholm
ee786b748d Merge "Remove generation of the dexpreopt tool paths from make."
am: 2e31874c7a

Change-Id: I41cf079934369365bcb50ba1de3b2e4f00a79531
2020-01-08 03:02:19 -08:00
Martin Stjernholm
2e31874c7a Merge "Remove generation of the dexpreopt tool paths from make." 2020-01-08 10:40:28 +00:00
Jiyong Park
bee946e8eb jacoco-report-classes-all.jar includes jar from other partitions
jacoco-report-classes-all.jar now depends on all installed files
including apks in /apex. Previously, it depended only on files under
system.img and as a result jacoco for other partitions were missing.

Bug: 147296855
Test: m

Change-Id: I755de1205ebc43c197af36a13cca5f4b49e275e8
2020-01-08 14:41:45 +09:00
android-build-team Robot
9408bda59e Make change and version bump to QQ2A.200108.001
Change-Id: I1f7115159ffb4b5cd457f6ac1bd7b932a8a81b02
2020-01-08 02:33:04 +00:00
Automerger Merge Worker
bf85f8c9df Merge "Add system_ext to VINTF search paths." am: 620a2f2366 am: da4b88148c
Change-Id: I047a068abe35fe836dea481cd1716b4188a0dba0
2020-01-07 23:34:20 +00:00
Xin Li
c4dd701883 DO NOT MERGE - Merge January 2020 Security Release into master
Bug: 147314974
Change-Id: I1d6098643e9d3711e663b521dca875254008e787
2020-01-07 15:25:06 -08:00
Yifan Hong
da4b88148c Merge "Add system_ext to VINTF search paths."
am: 620a2f2366

Change-Id: Ie44a49b5f435ff06a7bcd69af8c2b4e35b0419cc
2020-01-07 15:12:20 -08:00
Automerger Merge Worker
950604f8da Merge "vibrator: use package as name" am: c8b0187c8b am: e819518de8
Change-Id: If810c6606b9e40150f74848874b01152addf7b73
2020-01-07 23:07:40 +00:00
Treehugger Robot
620a2f2366 Merge "Add system_ext to VINTF search paths." 2020-01-07 23:04:54 +00:00
Steven Moreland
e819518de8 Merge "vibrator: use package as name"
am: c8b0187c8b

Change-Id: Iafa4e3ea4288a19aba6f60ed226b551326af3e13
2020-01-07 14:48:32 -08:00
Steven Moreland
c8b0187c8b Merge "vibrator: use package as name" 2020-01-07 22:43:01 +00:00
Automerger Merge Worker
3acd797b9f Merge "Add new compiler warning patterns" am: 3a59a5f66a am: c2c765a00a
Change-Id: I226787304e8a6e77c9ebeaeab9c72aa32e0fd5f4
2020-01-07 22:25:21 +00:00
Chih-hung Hsieh
c2c765a00a Merge "Add new compiler warning patterns"
am: 3a59a5f66a

Change-Id: I4fdc1a183acbbf596e044cf43350f4398e97a02f
2020-01-07 14:04:47 -08:00
Chih-hung Hsieh
3a59a5f66a Merge "Add new compiler warning patterns" 2020-01-07 21:49:01 +00:00
Automerger Merge Worker
9a0acae5e9 Merge "Revert submission 1182953-1576003954286-8455af5a" am: 42f2c761bf am: 7da11edb71
Change-Id: Ife36d7f71d16943e0044ab8e1155aeb74edfb6c6
2020-01-07 20:29:39 +00:00
Chen Xu
7da11edb71 Merge "Revert submission 1182953-1576003954286-8455af5a"
am: 42f2c761bf

Change-Id: Icf4a3918bd59e6d96da629dec9658ae959bb21ef
2020-01-07 12:07:13 -08:00
Chen Xu
42f2c761bf Merge "Revert submission 1182953-1576003954286-8455af5a" 2020-01-07 19:29:08 +00:00
Automerger Merge Worker
2b626d5038 Merge "Use symlinks in the build graph for jni libs" am: 7d44f2d01d am: 13f8dc992e
Change-Id: I51e3fcab757299acb45a8cd3393cead8ee14f7f9
2020-01-07 15:01:30 +00:00
Dan Willemsen
13f8dc992e Merge "Use symlinks in the build graph for jni libs"
am: 7d44f2d01d

Change-Id: I43f3bcce4569a72beaf4772008afda1bf3aebf90
2020-01-07 06:47:56 -08:00
Treehugger Robot
7d44f2d01d Merge "Use symlinks in the build graph for jni libs" 2020-01-07 14:42:51 +00:00
Automerger Merge Worker
e824c0a515 Merge "Remove DEX2OAT_DEPENDENCY which is the same as DEX2OAT." am: 8da546b295 am: 46f6017064
Change-Id: I1561a9fe1e59d0346a8395d8626b8ba6e475aff1
2020-01-07 13:17:26 +00:00
Martin Stjernholm
46f6017064 Merge "Remove DEX2OAT_DEPENDENCY which is the same as DEX2OAT."
am: 8da546b295

Change-Id: I93776b805dc23b4c5496f255e1e228b544017ac3
2020-01-07 05:02:13 -08:00
Martin Stjernholm
1e5581749d Remove generation of the dexpreopt tool paths from make.
They are now created from Soong, and therefore put in a separate config file
out/soong/dexpreopt_soong.config.

Test: m
Bug: 145934348
Change-Id: I27e710f09c37e64e8975b8e763d13434e5de71b3
2020-01-07 13:00:38 +00:00
Martin Stjernholm
8da546b295 Merge "Remove DEX2OAT_DEPENDENCY which is the same as DEX2OAT." 2020-01-07 12:37:07 +00:00
Automerger Merge Worker
dbaa0dd878 Merge "Respect JIT-zygote config when generating boot image location." am: 5268bfa61e am: bedd2a57f9
Change-Id: I9e236dbe5a9f82e26a6e6c1eefcedecf5a3cd3c0
2020-01-07 11:15:28 +00:00
Ulyana Trafimovich
bedd2a57f9 Merge "Respect JIT-zygote config when generating boot image location."
am: 5268bfa61e

Change-Id: I4cf43302005c80d543f24a45520fd0f7d3a9c14b
2020-01-07 03:01:03 -08:00
Ulyana Trafimovich
5268bfa61e Merge "Respect JIT-zygote config when generating boot image location." 2020-01-07 10:48:45 +00:00
Automerger Merge Worker
ea31abaf4f Merge "Clean up TARGET_FLATTEN_APEX lines in mainline products" am: 3ac9a12f5f am: 2eee2cd593
Change-Id: I1a634deadbbad49cfabf4ead80c0f0581e34ce82
2020-01-07 09:17:41 +00:00
Yo Chiang
2eee2cd593 Merge "Clean up TARGET_FLATTEN_APEX lines in mainline products"
am: 3ac9a12f5f

Change-Id: I6f9a585f165c724b3689c72abab8cc7228d032fd
2020-01-07 01:01:03 -08:00
Yo Chiang
3ac9a12f5f Merge "Clean up TARGET_FLATTEN_APEX lines in mainline products" 2020-01-07 08:41:53 +00:00
Automerger Merge Worker
a93eac7c3f Merge "Revert "Add boringssl_self_test to PRODUCT_PACKAGES"" am: ee83e2d2c8 am: 44e7c20968
Change-Id: I607fded6b55a3470fa705be224ffb19ef35d2380
2020-01-07 04:19:39 +00:00
Jiyong Park
44e7c20968 Merge "Revert "Add boringssl_self_test to PRODUCT_PACKAGES""
am: ee83e2d2c8

Change-Id: Ieea03a9be3a725208eb1a282885c165a770190ca
2020-01-06 20:04:20 -08:00
Treehugger Robot
ee83e2d2c8 Merge "Revert "Add boringssl_self_test to PRODUCT_PACKAGES"" 2020-01-07 03:51:29 +00:00
android-build-team Robot
22e0929656 Make change and version bump to QQ2A.200107.001
Change-Id: Ida1c1301004e1a0dd3a6281983e57070bb1abf77
2020-01-07 02:20:57 +00:00
Automerger Merge Worker
4c5e852883 Merge "update-vndk-list.sh delinated with ticks in error" am: 0fe0eda502 am: 81e3cfa8a3
Change-Id: I0b00593d9a43f21093cb41fe02af536b3c7ec17b
2020-01-07 02:07:59 +00:00
Steven Moreland
81e3cfa8a3 Merge "update-vndk-list.sh delinated with ticks in error"
am: 0fe0eda502

Change-Id: Ibc9784555bfb489911b56b0124928dd27dc94711
2020-01-06 17:52:38 -08:00
Treehugger Robot
0fe0eda502 Merge "update-vndk-list.sh delinated with ticks in error" 2020-01-07 01:47:42 +00:00
Martin Stjernholm
388a71f092 Remove DEX2OAT_DEPENDENCY which is the same as DEX2OAT.
Small cleanup to simplify the move of it into Soong.

Test: presubmits
Bug: 145934348
Change-Id: Ib4a0b69279f63d53405509b2d1529d9e60d46858
2020-01-07 00:00:29 +00:00
Steven Moreland
7e2ec0e5af update-vndk-list.sh delinated with ticks in error
People have asked me on several occassions how to fix this error. It's
somewhat confusing since scripts aren't usually on a path. However, in
this case, the script is added to the path on host. Hopefully, using
tick marks here will make that more clear.

Bug: N/A
Test: N/A
Change-Id: I8601a5a9eb348b2e358875b45eae57ec910c9a06
2020-01-06 15:05:07 -08:00
Steven Moreland
af96f5ff4e 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: I382074d66b06669876d8f9fa4fc95b8a9c4dbf2a
Merged-In: I382074d66b06669876d8f9fa4fc95b8a9c4dbf2a
2020-01-06 14:08:00 -08:00
Chih-Hung Hsieh
a9f7746f29 Add new compiler warning patterns
* Mostly new Java and Kotlin warnings found in nightly builds.
* More clean up of Java and C++ warning patterns will follow.

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Change-Id: I8776401d15c3a59535722d52a5eec03f954d3b15
2020-01-06 12:11:44 -08:00
Automerger Merge Worker
2521dfcc51 Merge "Add unpack_bootimg to otatools to modify boot.img" am: eb28123fef am: e91b131bf6
Change-Id: I81b03757db624f00d3262bcf90f15da6f104e1bb
2020-01-06 19:09:22 +00:00
Daniel Mentz
e91b131bf6 Merge "Add unpack_bootimg to otatools to modify boot.img"
am: eb28123fef

Change-Id: Id475852d32699e3e263be46614a99962d42f773e
2020-01-06 10:53:03 -08:00
Daniel Mentz
eb28123fef Merge "Add unpack_bootimg to otatools to modify boot.img" 2020-01-06 18:43:56 +00:00
Dan Willemsen
b195e7ab04 Use symlinks in the build graph for jni libs
Now that ninja uses lstat and can support installing arbitrary symlinks,
switch jni lib symlinks from LOCAL_POST_INSTALL_CMDS to real rules.

Bug: 128577186
Test: List of files under PRODUCT_OUT is the same before/after this change
Test: out/target/product/generic/.installable_files now includes the symlinks
Test: m installclean; m NfcNci -> symlinks installed with correct dest
Test: m NfcNci; m NfcNci -> ninja: no work to do
Change-Id: I078dca53ab3d93f74c36fa66d5577e6e3e0640d6
2020-01-06 10:25:56 -08:00
Ulya Trafimovich
d1c9bfe87a 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: I449c968909635dd8cc431323fccbc7fce440fea5
2020-01-06 15:58:52 +00:00
android-build-team Robot
b0b66bcfc2 Make change and version bump to QQ2A.200106.001
Change-Id: I7bd4ddede5cfa5820711c8ebe0e34b26a3f14a68
2020-01-06 00:21:51 +00:00
android-build-team Robot
84d8c4cea0 Make change and version bump to QQ2A.200105.001
Change-Id: I2668048b49c3cc17d22a2ae99c5cc4248fe2afdc
2020-01-05 00:23:36 +00:00
Daniel Mentz
30652b3380 Add unpack_bootimg to otatools to modify boot.img
unpack_bootimg in conjunction with mkbootimg can be used to re-create
boot.img with a different kernel image and ramdisk.

Change-Id: I9615facc9335885989772a0dd7f08217e2143a45
2020-01-04 15:25:42 -08:00
Automerger Merge Worker
3bbef8f744 Merge "Export list of "installable" files to soong_ui" am: 99202ec0a6 am: 8e080ccefe
Change-Id: I0dd6e68b91057d93f41c47da80749c7dbcb80aea
2020-01-04 05:34:11 +00:00