Commit graph

18646 commits

Author SHA1 Message Date
Automerger Merge Worker
9cb0071b9e bundle config contains (path,manifest) pairs of embedded APKs am: cfaa1643e8
Change-Id: I9a823265cc275d3cd028673ef93af2c770e6031c
2020-02-29 09:32:38 +00:00
Automerger Merge Worker
878e45861b bundle config for apexes are auto-generated am: bd15961043
Change-Id: I1ee190b56f332f2c5be0cb34149f78756c1c1772
2020-02-29 09:32:35 +00:00
Jiyong Park
cfaa1643e8 bundle config contains (path,manifest) pairs of embedded APKs
If an APEX contains APKs and the manifest package name of the APKs are
overridden (either via override_android_app
orPRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES), that the path to the APK
(relative in the APEX) and the overridden manifest package name is
recorded in the bundle config file.

Bug: 148002117
Test: m

Change-Id: Ibb90bcefb77fa6b2dad77cb2facc6079de9ab154
2020-02-29 09:07:46 +09:00
Jiyong Park
bd15961043 bundle config for apexes are auto-generated
bundle config file for apexes are auto-generated. It is included in the
<apex>-base.zip file, which is expected to be extracted and then fed
into the bundletool.

This change is in preparation for the upcoming change to include
information about embedded apks in the bundle confir file.

Bug: 148002117
Test: m

Change-Id: If25d75e0f62036dc777faf8593ed8eb9a74950b0
2020-02-29 09:07:08 +09:00
Automerger Merge Worker
cf9a943972 Merge "Collect metrics from inside soong_build" am: 9403e4b704
Change-Id: I851f0a8a78a815131e5c42c6fb567dc3573b5799
2020-02-28 23:39:20 +00:00
Colin Cross
9403e4b704 Merge "Collect metrics from inside soong_build" 2020-02-28 23:23:29 +00:00
Automerger Merge Worker
4217e8020c Merge "Emit error if expression cannot be evaluated to boolean during androidmk conversion" am: b2d0565fc9
Change-Id: I6370b250489d65809aa21eb6019687ed2f159580
2020-02-28 20:32:56 +00:00
Automerger Merge Worker
5e1f7bf09b Merge changes from topic "soong_build_number_file" am: f14cd86e23
Change-Id: I5dd8a75a637b6d1070d1883733ba6623532d258d
2020-02-28 20:32:28 +00:00
Automerger Merge Worker
ecd9330b33 Add support for order-only dependencies to RuleBuilder am: da71eda20d
Change-Id: Ia37ce4e5d6414db90df6438824394abbe09e4161
2020-02-28 20:32:26 +00:00
Treehugger Robot
b2d0565fc9 Merge "Emit error if expression cannot be evaluated to boolean during androidmk conversion" 2020-02-28 20:30:21 +00:00
Treehugger Robot
f14cd86e23 Merge changes from topic "soong_build_number_file"
* changes:
  Add an order-only dependency on the build number file
  Add support for order-only dependencies to RuleBuilder
2020-02-28 20:15:52 +00:00
Automerger Merge Worker
74fc841755 Merge "Use header jar without jarjar for sharded classpath" am: c2f4f20bde
Change-Id: I56ef3325e1dd6fcdecb47dd7acef305557f03d4e
2020-02-28 19:54:30 +00:00
Treehugger Robot
c2f4f20bde Merge "Use header jar without jarjar for sharded classpath" 2020-02-28 19:40:41 +00:00
Colin Cross
2a2e0db2a2 Add an order-only dependency on the build number file
Remote execution and other tools can be confused by references to
build_number.txt without a dependency.  Add an order-only dependency,
which maintains the current behavior.

Test: BUILD_NUMBER=1 && m aapt && aapt version # shows 1
      BUILD_NUMBER=2 && m aapt && aapt version # shows 1
      rm out/soong/.intermediates/frameworks/base/tools/aapt/aapt/linux_glibc_x86_64/aapt
      BUILD_NUMBER=2 && m aapt && aapt version # shows 2
Change-Id: Icfa98d6840b1dc2e273ba29c33011635d1cf93b1
2020-02-28 18:16:56 +00:00
Colin Cross
da71eda20d Add support for order-only dependencies to RuleBuilder
Test: TestRuleBuilder
Change-Id: I1609a790dd4d0a03c8308b6e552622fe33fa2499
2020-02-28 18:16:13 +00:00
Automerger Merge Worker
77de0c97a0 Merge "Add "jni_libs" property to apex module" am: c6e538406c
Change-Id: I7fa3e4f9e84ff564bb632706d5b755b657972b59
2020-02-28 17:23:09 +00:00
Automerger Merge Worker
450510faa7 Merge changes I789b526c,Ie15c811f am: 6e147e4f54
Change-Id: I67a97d5d537f986ec3018d7ecaaa94143f48b7ef
2020-02-28 17:22:51 +00:00
Sasha Smundak
6a9f5cfa1e Emit error if expression cannot be evaluated to boolean during androidmk conversion
Fixes: 127517965
Test: run androidmk /sdx/asmundak/repos/iandr/vendor/google_paintbox/amber/camera/tests/Android.mk
Change-Id: If7b6bcb88bb8f25d3f421a847750a82b1e50833e
2020-02-28 09:18:08 -08:00
Jooyung Han
c6e538406c Merge "Add "jni_libs" property to apex module" 2020-02-28 17:12:53 +00:00
Jooyung Han
6e147e4f54 Merge changes I789b526c,Ie15c811f
* changes:
  apex: refactor apex properties
  apex: fix a test util (ensureExactContent)
2020-02-28 17:08:45 +00:00
Automerger Merge Worker
bf3da2c758 Merge changes I32bc93e0,I7ec47dbc am: dd72d689e7
Change-Id: Icaaa8deaa2ff925e9fa196d7302821cff0d62e5d
2020-02-28 11:28:09 +00:00
Paul Duffin
dd72d689e7 Merge changes I32bc93e0,I7ec47dbc
* changes:
  Avoid invoking sdk member to add empty list of dependencies
  Add windows to the list of available OS's in sdk tests
2020-02-28 11:22:18 +00:00
Automerger Merge Worker
902afd2dbe Merge "Distinguish boot images by target rather than arch" am: e7ea9e631d
Change-Id: I168a8e3227df2830e51aa4ba0eb5dbbe011704c4
2020-02-28 11:21:13 +00:00
Paul Duffin
cc1b3da17a Avoid invoking sdk member to add empty list of dependencies
Simplifies debugging sdk membership code when it is only called if an
appropriate member is present.

Test: m nothing
Change-Id: I32bc93e0484c829bdbd6b050822249feb6404f89
2020-02-28 11:21:06 +00:00
Paul Duffin
08798aae0b Add windows to the list of available OS's in sdk tests
Makes the tests more realistic as they cover what happens when an sdk
OS specific variant is disabled (Windows is disabled by default). This
will allow issues around disabled variants to be detected early during
Soong bootstrapping.

Test: m nothing
Change-Id: I7ec47dbca52e38750166d755daf706aadea12d15
2020-02-28 11:21:06 +00:00
David Srbecky
e7ea9e631d Merge "Distinguish boot images by target rather than arch" 2020-02-28 11:07:45 +00:00
Automerger Merge Worker
82e9e2833a Merge "No symlink for host APEXes" am: 0ffa3aba78
Change-Id: Idd179e8a305f6797cf83fdc277ab1d83f1b32f24
2020-02-28 00:14:23 +00:00
Jiyong Park
0ffa3aba78 Merge "No symlink for host APEXes" 2020-02-27 23:56:24 +00:00
Automerger Merge Worker
dde07924cb Merge "Only dist apex sizes for checkbuild" am: 2d4b8d2188
Change-Id: I7aa8503bd0937ad4f6e201df898ca7ca4537fd7e
2020-02-27 21:34:47 +00:00
Colin Cross
2d4b8d2188 Merge "Only dist apex sizes for checkbuild" 2020-02-27 21:08:11 +00:00
Automerger Merge Worker
6d6dc316a5 Merge changes I9170c7e2,I058201b2,Icf37bb3d am: 2642bc6d82
Change-Id: I40b76cec7de135ee28e9382ba4f43e8e70a5b287
2020-02-27 15:40:59 +00:00
Treehugger Robot
2642bc6d82 Merge changes I9170c7e2,I058201b2,Icf37bb3d
* changes:
  Make filesToInstall return InstallPaths and add it to Module
  Add pathForInstall and InstallPaths
  Add InstallForceOS, fix testcases for host
2020-02-27 15:28:49 +00:00
Automerger Merge Worker
a3cc927fdb Merge "Support arch variant for data attribute" am: 6f9bfc01a2
Change-Id: I0568135c66bdefb7c060a9fc0c0280e68a034877
2020-02-27 06:25:28 +00:00
Dan Shi
6f9bfc01a2 Merge "Support arch variant for data attribute" 2020-02-27 06:06:50 +00:00
Jooyung Han
643adc4896 Add "jni_libs" property to apex module
Which is the list of JNI libraries that are embeded inside the apex.
jni_libs is handled just like native_shared_libs except that it is
stored in apex_manifest.

When linkerconfig finds an apex with JNI libs, it exposes the namespace
for the apex as visible so that libnativeloader can link the namespace
to the corresponding classloader-namespace.

Bug: 149363889
Test: m nothing(runs soong test)
Change-Id: I52ebe38b44545e6e8853e34a3404a235c858112a
2020-02-27 13:50:06 +09:00
Jooyung Han
01a868d096 apex: refactor apex properties
Embed common properties (apexNativeDependencies) so that the logic for
adding dependencies for native modules can be reused.

Bug: N/A
Test: m

Change-Id: I789b526c09eea14213ab1544590ed2238ed8c625
2020-02-27 13:45:14 +09:00
Jooyung Han
e6436d7bf0 apex: fix a test util (ensureExactContent)
ensureExactContent shouldn't return immediately when it finds a match
from expected list of files.

Bug: N/A
Test: m nothing
Change-Id: Ie15c811f9cfcae7ede28dee0fcf203cee24659a0
2020-02-27 13:31:56 +09:00
Jiyong Park
638d30ed21 No symlink for host APEXes
Symlinking doesn't make sense for host APEXes.

Bug: 150255435
Test: m com.android.art.host and inspect the built APEX; there is
no symlink.

Merged-In: I28492dfaaef471117a430be05255fbef76e557b0
(cherry picked from commit 9b96418dfe)
Change-Id: I28492dfaaef471117a430be05255fbef76e557b0
2020-02-27 12:09:33 +09:00
Colin Cross
1c85e8e019 Only dist apex sizes for checkbuild
Using $(call dist-for-goals,droidcore,...) for every apex
installed-files.txt causes every apex to be built for all builds,
causing a signficiant regression in build time.  For now only
dist them in checkbuilds, which were going to build all of them
anyways.

Ideally we would like to dist the installed-files.txt only if
the apex was already built, but there is not currently a way to
express that.

Test: treehugger
Bug: 149979076
Change-Id: I21edbc90980f94ad6d497cb86ee80223dd782fe1
2020-02-27 00:58:50 +00:00
Automerger Merge Worker
a5dfbff82f Merge "In kzip files, compilation unit paths should be relative to top." am: 21321efc66
Change-Id: I762f3f7905ce7f8bcb5742942d40429ff4c6747f
2020-02-26 21:39:14 +00:00
Alexander Smundak
21321efc66 Merge "In kzip files, compilation unit paths should be relative to top." 2020-02-26 21:31:37 +00:00
Automerger Merge Worker
c07a0cf902 Merge "Unless overridden include LICENSE files in notices." am: 40017be1c3
Change-Id: Idd0793baf0e6c18ed3bc1bd295a70228d6c553cd
2020-02-26 20:49:00 +00:00
Bob Badour
40017be1c3 Merge "Unless overridden include LICENSE files in notices." 2020-02-26 20:37:22 +00:00
David Srbecky
c177ebeca9 Distinguish boot images by target rather than arch
We plan to add boot image variants for host tests.
Distinguishing the variants by arch does not work,
since both host and device can have the same arch.

Change-Id: Iea73c77367affb074f97a0fc318389417ce537da
2020-02-26 17:04:21 +00:00
Automerger Merge Worker
35189efd1d Convert cc to AndroidMkEntries am: d80cbca76d
Change-Id: I509d14736842b97489dc63c01ad0b0412124154c
2020-02-26 16:51:59 +00:00
Colin Cross
d80cbca76d Convert cc to AndroidMkEntries
Use AndroidMkEntries so the next patch can use ExtraFooters, which
doesn't exist in AndroidMkData.

Test: manually diff out/soong/Android.aosp_x86_64.mk
Change-Id: Ia3006b6747813693cf7e2b536030b21f3109f538
2020-02-25 19:53:04 -08:00
Automerger Merge Worker
52b4afe8f2 Merge "apex: do not follow jni_libs from android_app" am: 077f9a44f9
Change-Id: Ibe282ebd930a6a53026eda08a6abb1bc28894fb5
2020-02-26 02:55:48 +00:00
Jooyung Han
077f9a44f9 Merge "apex: do not follow jni_libs from android_app" 2020-02-26 02:35:10 +00:00
Dan Shi
67a8834735 Support arch variant for data attribute
Bug: 143220441
Test: atest VtsHalDrmV1_2TargetTest
Change-Id: I2381f78b486852da267caa363b4c4cb5660c9055
2020-02-25 16:34:39 -08:00
Automerger Merge Worker
0c34e7e308 Merge "Update ike.jar's name in code coverage configuration" am: 9a63ee1b4f
Change-Id: I0484fed50a5b727c854e194fab2160315d07aca0
2020-02-25 22:04:10 +00:00