Commit Graph

22765 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
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
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
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
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
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
Dan Willemsen
8e080ccefe Merge "Export list of "installable" files to soong_ui"
am: 99202ec0a6

Change-Id: I252f4748396572d4b6c0f26148dc51b0c01b2f9e
2020-01-03 21:19:55 -08:00
Treehugger Robot
99202ec0a6 Merge "Export list of "installable" files to soong_ui" 2020-01-04 05:16:24 +00:00
Dan Willemsen
dec6e8e056 Export list of "installable" files to soong_ui
These are a (partial) list of files that we'd install with a default
build. The idea is that if something is removed from this list, soong_ui
can remove it from the installed location before running ninja.

It's okay if there are things missing from this list, it's not intended
to be a 100% solution replacing installclean / CleanSpec.mk, just
something that handles 80% of the cases without user involvement.

In particular, if something is removed from PRODUCT_PACKAGES, we'll
remove it from disk, but not necessarily rebuild the image files. That's
the same as most use cases of CleanSpec.mk today, and often some other
change will trigger the necessary images to be rebuilt.

We should be able to fix that by changing all of the image creation
rules to depend on the (partial) list of files they care about, or by
fixing ninja to rebuild things when their list of dependencies change.
(Other tools run into this same problem)

The list of test files is also included so that we can remove obsolete
tests from their "installed" locations within test suites and the
testcases folders.

Test: remove a module from PRODUCT_PACKAGES, see the print and file removed
Test: change the name of a cts test, see the old one removed from cts
Change-Id: I67f270a6713369099ca523aaf991ee3beb815c0a
2020-01-03 19:19:11 -08:00
android-build-team Robot
0108215cc6 Make change and version bump to QQ2A.200104.001
Change-Id: I9985323bb6a17ccb78722de3a4ca46905b0be58e
2020-01-04 02:22:13 +00:00
Automerger Merge Worker
d57b01a563 Merge "Add BUILD_BROKEN_NINJA_USES_ENV_VARS" am: f29df793c9 am: a9bfb4faba
Change-Id: Ifd7b3b990d66080dd091098955552a8f4018b7c5
2020-01-04 02:20:21 +00:00
Dan Willemsen
a9bfb4faba Merge "Add BUILD_BROKEN_NINJA_USES_ENV_VARS"
am: f29df793c9

Change-Id: Iae9ee9bbb18a153000e37204236e653465aba018
2020-01-03 18:04:04 -08:00
Treehugger Robot
f29df793c9 Merge "Add BUILD_BROKEN_NINJA_USES_ENV_VARS" 2020-01-04 01:32:40 +00:00
Automerger Merge Worker
de4fd03ad9 Merge "Add Soong android_app and android_test modules to javac-check" am: 6e54952b44 am: 253f31621e
Change-Id: I45850d29610778d8fad9b415d7b11d71446cad56
2020-01-03 19:37:22 +00:00
Colin Cross
253f31621e Merge "Add Soong android_app and android_test modules to javac-check"
am: 6e54952b44

Change-Id: I5ca7e4bd210a66aaeb305ab7ab326683ef89ea0b
2020-01-03 11:23:43 -08:00
Dan Willemsen
2607625f8b Add BUILD_BROKEN_NINJA_USES_ENV_VARS
See the Changes.md and the paired soong change for more information.

Test: Add BUILD_BROKEN_NINJA_USES_ENV_VARS := OLDPWD
      ALLOW_NINJA_ENV=false m nothing; check out/soong.log
Change-Id: I2167eac52166b513318bc48feb71c9d0b80e5fd4
2020-01-02 20:09:25 -08:00
android-build-team Robot
a87aa85584 Make change and version bump to QQ2A.200103.001
Change-Id: I2dc71ff565f0555b37edb4bfeb4ab4baeb5c4607
2020-01-03 02:21:10 +00:00
Xin Li
68446d2662 DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master
Merged-In: I7e4e99e0da7387b13c94059b7ab1beb98ac47591
Change-Id: I2b18bf376c9d5ce988be10cabdf328f53a78ecab
2020-01-02 23:03:40 +00:00
android-build-team Robot
990fb07126 Make change and version bump to QQ2A.200102.001
Change-Id: I830060372a7cd1594e7bb46318774db4cc09fc85
2020-01-02 02:21:41 +00:00
android-build-team Robot
bfac67c8b0 Make change and version bump to QQ2A.200101.001
Change-Id: Ie6e012ce396c82c2c3f4a16648710c3472f416d1
2020-01-01 02:21:16 +00:00
Colin Cross
8e28a17bfe Add Soong android_app and android_test modules to javac-check
android_app and android_test modules were not built as part of
javac-check, which resulted in not running them in the Error Prone
build.

Fixes: 146455923
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I278d7ee0cdc3f49aa8fa4d4f13309e29d700f2ba
2019-12-30 22:08:07 -08:00
android-build-team Robot
042312a5ac Make change and version bump to QQ2A.191231.001
Change-Id: Ib7da82533aa39eb426c61387771dbdfbd52c136c
2019-12-31 02:21:09 +00:00
android-build-team Robot
a0f99511be Make change and version bump to QQ2A.191230.001
Change-Id: I1a701281893ff419df6780db19ef2bee14d14ad2
2019-12-30 00:21:27 +00:00
android-build-team Robot
d812407248 Make change and version bump to QQ2A.191229.001
Change-Id: Ie9e77acdac652793af41d2b44d6d65817cb2da6f
2019-12-29 00:22:11 +00:00
android-build-team Robot
797fc475be Make change and version bump to QQ2A.191228.001
Change-Id: I12877995973db63d0819a874da594349357e5863
2019-12-28 02:19:33 +00:00
Automerger Merge Worker
4e3a78ff3b Merge "Stop removing valid copy headers" am: 4506b17dd3 am: 04b25efc91
Change-Id: Ife2bd4fd3526828b667a591415e7f4689c325aa2
2019-12-27 02:37:58 +00:00
android-build-team Robot
c3728a0d4d Make change and version bump to QQ2A.191227.001
Change-Id: I89a33e11f7e8852b599d5cb55e20850ed10b89a2
2019-12-27 02:20:29 +00:00
Dan Willemsen
13cb165b91 Stop removing valid copy headers
My change to clean up obsolete copy headers would remove valid ones if
thhe LOCAL_COPY_HEADERS_TO path wasn't cleaned. I'm seeing this most
with values that just end in '/', so we end up with a '//' in the path,
which isn't textually equivalent, and we remove it.

Test: No longer seeing constant removals on internal products
Test: Set LOCAL_COPY_HEADERS_TO := ..
Test: Set LOCAL_COPY_HEADERS_TO := ../foo
Test: Set LOCAL_COPY_HEADERS_TO := /foo
Change-Id: Idbeeb207a2bb2a8da766473dbded877cec7c9cc1
2019-12-26 16:52:34 -08:00
android-build-team Robot
9ba3f7c655 Make change and version bump to QQ2A.191226.001
Change-Id: I5c0fefecea4fdcb360c74cc47dbd40eb763313e4
2019-12-26 02:20:43 +00:00
Automerger Merge Worker
4bce5b4f4b Merge "Define ro.product.vndk.version" am: e8139b905d am: a126b69335
Change-Id: If7676e80733b8a4a6b4e958a20f8e9d9e3fcf322
2019-12-25 09:15:53 +00:00
android-build-team Robot
ae93e0f3ab Make change and version bump to QQ2A.191225.001
Change-Id: Ia45ce4c4e57ad21e23e188e11106e5d16e6f3fbe
2019-12-25 02:20:36 +00:00
Justin Yun
04e5a40f2c Define ro.product.vndk.version
Use ro.product.vndk.version to show the VNDK version that the product
partition is using.
When PRODUCT_PRODUCT_VNDK_VERSION is set, add ro.product.vndk.version
in /product/build.prop.
If PRODUCT_PRODUCT_VNDK_VERSION is "current", ro.product.vndk.version
will have the VNDK version in PLATFORM_VNDK_VERSION. Otherwise, it
will have the value defined in PRODUCT_PRODUCT_VNDK_VERSION.

Bug: 144534640
Test: Check if /product/build.prop has "ro.product.vndk.version"
Change-Id: If5e7e3a6c155de45f88f68700f16175656896afe
2019-12-24 07:20:43 +00:00